Merge pull request #243 from arduino/devel

Deploy configuration overhaul and support for proxies

Author: rsora

config.ini

@@ -1,8 +1,8 @@
-configUpdateInterval = 0  # Update interval for re-reading config file set via -config flag. Zero disables config file re-reading.
 gc = std  # Type of garbage collection. std = Normal garbage collection allowing system to decide (this has been known to cause a stop the world in the middle of a CNC job which can cause lost responses from the CNC controller and thus stalled jobs. use max instead to solve.), off = let memory grow unbounded (you have to send in the gc command manually to garbage collect or you will run out of RAM eventually), max = Force garbage collection on each recv or send on a serial port (this minimizes stop the world events and thus lost serial responses, but increases CPU usage)
 hostname = unknown-hostname  # Override the hostname we get from the OS
-ls = false  # launch self 5 seconds later
 regex = usb|acm|com  # Regular expression to filter serial port list
 v = true  # show debug logging
 appName = CreateBridge
 updateUrl = http://downloads.arduino.cc/
+origins = http://local.arduino.cc:8080
+#httpProxy = http://your.proxy:port # Proxy server for HTTP requests

hub.go

@@ -276,7 +276,7 @@ func exit() {
 
 }
 
-func restart(path string) {
+func restart(path string, args ...string) {
 	log.Println("called restart", path)
 	quitSysTray()
 	// relaunch ourself and exit
@@ -302,14 +302,9 @@ func restart(path string) {
 
 	exePath = strings.Trim(exePath, "\n")
 
-	hiberString := ""
-	if *hibernate == true {
-		hiberString = "-hibernate"
-	}
-
-	cmd := exec.Command(exePath, "-ls", "-regex", *regExpFilter, "-gc", *gcType, hiberString)
-
-	fmt.Println(cmd)
+	args = append(args, "-ls")
+	args = append(args, "-hibernate="+fmt.Sprint(*hibernate))
+	cmd := exec.Command(exePath, args...)
 
 	err := cmd.Start()
 	if err != nil {

info.go

@@ -13,12 +13,12 @@ func infoHandler(c *gin.Context) {
 	host = parts[0]
 
 	c.JSON(200, gin.H{
-		"version": version,
-		"http":    "http://" + host + port,
-		"https":   "https://localhost" + portSSL,
-		"ws":      "ws://" + host + port,
-		"wss":     "wss://localhost" + portSSL,
-		"origins": origins,
+		"version":    version,
+		"http":       "http://" + host + port,
+		"https":      "https://localhost" + portSSL,
+		"ws":         "ws://" + host + port,
+		"wss":        "wss://localhost" + portSSL,
+		"origins":    origins,
 		"update_url": updateUrl,
 	})
 }

main.go

@@ -31,7 +31,6 @@
 package main
 
 import (
-	"flag"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -42,7 +41,6 @@ import (
 	"github.com/go-ini/ini"
 	"github.com/kardianos/osext"
 	"github.com/skratchdot/open-golang/open"
-	"github.com/vharitonsky/iniflags"
 	"go.bug.st/serial.v1"
 )
 
@@ -101,21 +99,6 @@ func getConfigs() []ConfigIni {
 	return configs
 }
 
-func applyEnvironment(filename string) {
-	src, _ := osext.Executable()
-	dest := filepath.Dir(src)
-	cfg, _ := ini.LoadSources(ini.LoadOptions{IgnoreInlineComment: true}, filepath.Join(dest, filename))
-	defaultSection, err := cfg.GetSection("env")
-	if err != nil {
-		return
-	}
-	for _, env := range defaultSection.KeyStrings() {
-		val := defaultSection.Key(env).String()
-		log.Info("Applying env setting: " + env + "=" + val)
-		os.Setenv(env, val)
-	}
-}
-
 func setupSysTrayReal() {
 
 	systray.SetIcon(icon.GetIcon())
@@ -133,14 +116,11 @@ func setupSysTrayReal() {
 			mConfigCheckbox = append(mConfigCheckbox, entry)
 			// decorate configs
 			gliph := " ☐ "
-			if *configIni == config.Localtion {
+			if *additionalConfig == config.Localtion {
 				gliph = " 🗹 "
 			}
 			entry.SetTitle(gliph + config.Name)
 		}
-	} else {
-		// apply env setting from first config immediately
-		// applyEnvironment(configs[0].Localtion)
 	}
 	//mQuit := systray.AddMenuItem("Quit Plugin", "")
 
@@ -150,16 +130,8 @@ func setupSysTrayReal() {
 		go func(v int) {
 			for {
 				<-mConfigCheckbox[v].ClickedCh
-				flag.Set("config", configs[v].Localtion)
-				iniflags.UpdateConfig()
-				applyEnvironment(configs[v].Localtion)
-				mConfigCheckbox[v].SetTitle(" 🗹 " + configs[v].Name)
-				//mConfigCheckbox[v].Check()
-				for j, _ := range mConfigCheckbox {
-					if j != v {
-						mConfigCheckbox[j].SetTitle(" ☐ " + configs[j].Name)
-					}
-				}
+
+				restart("", "-additional-config", configs[v].Localtion)
 			}
 		}(i)
 	}

trayicon.go

@@ -206,11 +206,6 @@
 			"revision": "c8748311a7528d0ba7330d302adbc5a677ef9c9e",
 			"revisionTime": "2015-02-21T09:03:35-05:00"
 		},
-		{
-			"path": "github.com/vharitonsky/iniflags",
-			"revision": "02b57ef987a5ee59eedc7dcd93315a43f6dcc4a7",
-			"revisionTime": "2015-11-14T13:23:54+02:00"
-		},
 		{
 			"path": "github.com/xrash/smetrics",
 			"revision": "81a89232431423f9140fa413823ce3045f02f19c",