Fixing merge conflicts

wwu-cs-support · Jun 6, 2017 · 23b2c6b · 23b2c6b
2 parents cea5bef + 0832ea1
commit 23b2c6b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/config.json b/config.json
@@ -43,13 +43,13 @@
   "machineIdentifiers": [
     {
       "name": "linux",
-      "port": "8080",
-      "color":"MediumSeaGreen"
+      "port": "***REMOVED***",
+      "color":"#058c42"
     },
     {
       "name": "windows",
-      "port": "8080",
-      "color": "MediumSlateBlue"
+      "port": "***REMOVED***",
+      "color": "#2c5da5"
     }
   ]
 }
diff --git a/static/style.go b/static/style.go
@@ -18,9 +18,10 @@ const Style = `
 
 
 .cs_lab {
-  background:tomato;
+  background:#070707;
   width:200px;
   padding:20px;
+  margin:10px;
   justify-content:flex-start;
   align-content:space-between;
 }

diff --git a/status.go b/status.go
@@ -52,6 +52,7 @@ func (m *Machine) Update(out chan *Machine, config *Config) {
 func getStatus(hostname string, config *Config) string {
 
 	for _, identifier := range config.MachineIdentifiers {
+		time.Sleep(100 * time.Millisecond)
 		if accessible(hostname, identifier["port"].(string)) {
 			return identifier["name"].(string)
 		}
@@ -63,7 +64,7 @@ func getStatus(hostname string, config *Config) string {
 // accessible takes a hostname and a port number and tries to establish a
 // connection using those parameters.
 func accessible(hostn string, port string) bool {
-	conn, err := net.DialTimeout("tcp", hostn+":"+port, 1*time.Second)
+	conn, err := net.DialTimeout("tcp", hostn+":"+port, 5*time.Second)
 
 	if err == nil {
 		conn.Close()