diff --git a/internal/edgeapps/edgeapps.go b/internal/edgeapps/edgeapps.go index 25b8cfd..d9a24b9 100644 --- a/internal/edgeapps/edgeapps.go +++ b/internal/edgeapps/edgeapps.go @@ -75,6 +75,8 @@ func GetEdgeApp(ID string) MaybeEdgeApp { myEdgeAppServiceEnv, err := godotenv.Read(utils.GetPath("edgeAppsPath") + ID + myEdgeAppServiceEnvFilename) if err != nil { + log.Println("No myedge.app environment file found. Status is Network-Only") + } else { if myEdgeAppServiceEnv["INTERNET_URL"] != "" { edgeAppInternetAccessible = true edgeAppInternetURL = myEdgeAppServiceEnv["INTERNET_URL"] @@ -248,6 +250,8 @@ func DisableOnline(ID string) MaybeEdgeApp { envFilePath := utils.GetPath("edgeAppsPath") + ID + myEdgeAppServiceEnvFilename _, err := godotenv.Read(envFilePath) if err != nil { + log.Println("myedge.app environment file for " + ID + " not found. No need to delete.") + } else { cmdArgs := []string{envFilePath} utils.Exec("rm", cmdArgs) } @@ -260,8 +264,8 @@ func DisableOnline(ID string) MaybeEdgeApp { func buildFrameworkContainers() { - cmdArgs := []string{"--build"} - utils.Exec("./"+utils.GetPath("wsPath")+"/ws", cmdArgs) + cmdArgs := []string{utils.GetPath("wsPath") + "ws", "--build"} + utils.Exec("sh", cmdArgs) time.Sleep(defaultContainerOperationSleepTime) diff --git a/internal/tasks/tasks.go b/internal/tasks/tasks.go index cdba70f..5cdf2b8 100644 --- a/internal/tasks/tasks.go +++ b/internal/tasks/tasks.go @@ -275,7 +275,7 @@ func taskEnableOnline(args taskEnableOnlineArgs) string { func taskDisableOnline(args taskDisableOnlineArgs) string { - fmt.Println("Executing taskEnableOnline for " + args.ID) + fmt.Println("Executing taskDisableOnline for " + args.ID) result := edgeapps.DisableOnline(args.ID) diff --git a/internal/utils/utils.go b/internal/utils/utils.go index 89ce220..0fd74c1 100644 --- a/internal/utils/utils.go +++ b/internal/utils/utils.go @@ -2,9 +2,10 @@ package utils import ( "bytes" + "fmt" "log" "os/exec" - + "github.com/joho/godotenv" ) @@ -15,13 +16,14 @@ func Exec(command string, args []string) string { var stderr bytes.Buffer cmd.Stdout = &out cmd.Stderr = &stderr + cmd.Dir = GetPath("wsPath") err := cmd.Run() if err != nil { // TODO: Deal with possibility of error in command, allow explicit error handling and return proper formatted stderr - // log.Println(fmt.Sprint(err) + ": " + stderr.String()) // ... Silence... + log.Println(fmt.Sprint(err) + ": " + stderr.String()) // ... Silence... } - // log.Println("Result: " + out.String()) // ... Silence ... + log.Println("Result: " + out.String()) // ... Silence ... return out.String()