Merge pull request #471 from Darkren/fix/setting-proxy-settings

Fix setting proxy settings
skycoin · Aug 14, 2020 · c7ae857 · c7ae857
2 parents fecd744 + a288842
commit c7ae857
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/pkg/app/launcher/launcher.go b/pkg/app/launcher/launcher.go
@@ -113,7 +113,13 @@ func (l *Launcher) ResetConfig(conf Config) {
 		apps[ac.Name] = ac
 	}
 	l.apps = apps
-	l.conf = conf
+
+	// we shouldn't change directories of apps, it causes
+	// all kinds of troubles and also doesn't make sense.
+	// So, just changing individual fields
+	l.conf.VisorPK = conf.VisorPK
+	l.conf.Apps = conf.Apps
+	l.conf.ServerAddr = conf.ServerAddr
 }
 
 // AutoStart auto-starts marked apps.
@@ -251,7 +257,8 @@ func (l *Launcher) RestartApp(name string) error {
 	}
 
 	cmd := proc.Cmd()
-	if err := l.StartApp(name, cmd.Args, cmd.Env); err != nil {
+	// complete list of args includes binary name which is not needed, so omit it
+	if err := l.StartApp(name, cmd.Args[1:], cmd.Env); err != nil {
 		return fmt.Errorf("failed to start %s: %w", name, err)
 	}
 

diff --git a/pkg/visor/rpc_client.go b/pkg/visor/rpc_client.go
@@ -184,7 +184,7 @@ func (rc *rpcClient) SetAppPassword(appName, password string) error {
 
 // SetAppPK calls SetAppPK.
 func (rc *rpcClient) SetAppPK(appName string, pk cipher.PubKey) error {
-	return rc.Call("SetSocksClientPK", &SetAppPKIn{
+	return rc.Call("SetAppPK", &SetAppPKIn{
 		AppName: appName,
 		PK:      pk,
 	}, &struct{}{})

diff --git a/pkg/visor/visorconfig/v1.go b/pkg/visor/visorconfig/v1.go
@@ -120,8 +120,6 @@ func (v1 *V1) UpdateAppAutostart(launch *launcher.Launcher, appName string, auto
 		VisorPK:    v1.PK,
 		Apps:       conf.Apps,
 		ServerAddr: conf.ServerAddr,
-		BinPath:    conf.BinPath,
-		LocalPath:  conf.LocalPath,
 	})
 	return v1.flush(v1)
 }
@@ -161,8 +159,7 @@ func (v1 *V1) UpdateAppArg(launch *launcher.Launcher, appName, argName, value st
 		VisorPK:    v1.PK,
 		Apps:       conf.Apps,
 		ServerAddr: conf.ServerAddr,
-		BinPath:    conf.BinPath,
-		LocalPath:  conf.LocalPath,
 	})
+
 	return v1.flush(v1)
 }