Dark-Alex-17/kapow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/server sets now environment variables KAPOW_DATA_URL and KAPOW_CONTROL_URL

Browse Source 
Remove golinter error S1036: unnecessary guard around map access in 
spawn package
This commit is contained in:
Héctor Hurtado
2020-04-03 21:42:42 +02:00
parent 1ff58d5332
commit 73ef493f04
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/cmd/server.go
+9 -1
View File
@@ -47,6 +47,14 @@ var ServerCmd = &cobra.Command{
sConf.ClientAuth, _ = cmd.Flags().GetBool("clientauth")
sConf.ClientCaFile, _ = cmd.Flags().GetString("clientcafile")
// Set environment variables KAPOW_DATA_URL and KAPOW_CONTROL_URL only if they aren't set so we don't overwrite user's preferences
if _, exist := os.LookupEnv("KAPOW_DATA_URL"); !exist {
os.Setenv("KAPOW_DATA_URL", "http://"+sConf.DataBindAddr)
}
if _, exist := os.LookupEnv("KAPOW_CONTROL_URL"); !exist {
os.Setenv("KAPOW_CONTROL_URL", "http://"+sConf.DataBindAddr)
}
go server.StartServer(sConf)
// start sub shell + ENV(KAPOW_CONTROL_URL)
@@ -60,7 +68,7 @@ var ServerCmd = &cobra.Command{
kapowCMD := exec.Command("bash", powfile)
kapowCMD.Stdout = os.Stdout
kapowCMD.Stderr = os.Stderr
kapowCMD.Env = append(os.Environ(), "KAPOW_CONTROL_URL=http://"+sConf.ControlBindAddr)
kapowCMD.Env = os.Environ()
err = kapowCMD.Run()
if err != nil {