unistack-org/micro
3
0
Fork 3
Code Issues 14 Pull Requests 2 Actions Packages Projects Releases 242 Wiki Activity

make source dir a variable

Browse Source
This commit is contained in:
Asim Aslam 2020-08-11 17:25:43 +01:00
parent e83a808b05
commit b6e1c7ac99
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/local/local.go
View File

@ -23,6 +23,8 @@ const defaultNamespace = "default"
var ( var (
// The directory for logs to be output // The directory for logs to be output
LogDir = filepath.Join(os.TempDir(), "micro", "logs") LogDir = filepath.Join(os.TempDir(), "micro", "logs")
// The source directory where code lives
SourceDir = filepath.Join(os.TempDir(), "micro", "uploads")
) )
type localRuntime struct { type localRuntime struct {
@ -68,8 +70,10 @@ func (r *localRuntime) checkoutSourceIfNeeded(s *runtime.Service) error {
return nil return nil
} }
// @todo make this come from config // @todo make this come from config
cpath := filepath.Join(os.TempDir(), "micro", "uploads", s.Source) cpath := filepath.Join(SourceDir, s.Source)
path := strings.ReplaceAll(cpath, ".tar.gz", "") path := strings.ReplaceAll(cpath, ".tar.gz", "")
// check if the directory already exists
if ex, _ := exists(cpath); ex { if ex, _ := exists(cpath); ex {
err := os.RemoveAll(path) err := os.RemoveAll(path)
if err != nil { if err != nil {
@ -86,6 +90,7 @@ func (r *localRuntime) checkoutSourceIfNeeded(s *runtime.Service) error {
s.Source = path s.Source = path
return nil return nil
} }
source, err := git.ParseSourceLocal("", s.Source) source, err := git.ParseSourceLocal("", s.Source)
if err != nil { if err != nil {
return err return err
@ -245,8 +250,7 @@ func (r *localRuntime) run(events <-chan runtime.Event) {
func logFile(serviceName string) string { func logFile(serviceName string) string {
// make the directory // make the directory
name := strings.Replace(serviceName, "/", "-", -1) name := strings.Replace(serviceName, "/", "-", -1)
path := filepath.Join(os.TempDir(), "micro", "logs") return filepath.Join(LogDir, fmt.Sprintf("%v.log", name))
return filepath.Join(path, fmt.Sprintf("%v.log", name))
} }
func serviceKey(s *runtime.Service) string { func serviceKey(s *runtime.Service) string {