X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fst.go;h=ac1e99d3ae388c41aac5ff73a009fe8583fe60d3;hb=82ede02a56e12026b2dfb1baeacabfbd564006b1;hp=bc3b101f49a264c3621006386d4c414c3dedde14;hpb=97ca1f277dc8b6973d6fa67add5593a9c395ce60;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index bc3b101..ac1e99d 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package st
 
 import (
@@ -98,7 +115,7 @@ func NewSyncThing(conf *xdsconfig.Config, log *logrus.Logger) *SyncThing {
 	}
 
 	if url == "" {
-		url = "http://localhost:8384"
+		url = "http://localhost:8386"
 	}
 	if url[0:7] != "http://" {
 		url = "http://" + url
@@ -119,7 +136,7 @@ func NewSyncThing(conf *xdsconfig.Config, log *logrus.Logger) *SyncThing {
 	}
 
 	// Create Events monitoring
-	// SEB TO TEST  s.Events = s.NewEventListener()
+	s.Events = s.NewEventListener()
 
 	return &s
 }
@@ -130,8 +147,9 @@ func (s *SyncThing) startProc(exeName string, args []string, env []string, eChan
 	var exePath string
 
 	// Kill existing process (useful for debug ;-) )
-	if os.Getenv("DEBUG_MODE") != "" {
-		exec.Command("bash", "-c", "pkill -9 "+exeName).Output()
+	if _, dbg := os.LookupEnv("XDS_DEBUG_MODE"); dbg {
+		fmt.Printf("\n!!! DEBUG_MODE set: KILL existing %s process(es) !!!\n", exeName)
+		exec.Command("bash", "-c", "ps -ax |grep "+exeName+" |grep "+s.BaseURL+" |cut  -d' ' -f 1|xargs -I{} kill -9 {}").Output()
 	}
 
 	// When not set (or set to '.') set bin to path of xds-agent executable
@@ -226,7 +244,7 @@ func (s *SyncThing) Start() (*exec.Cmd, error) {
 		"STNOUPGRADE=1",
 	}
 
-	/* SEB STILL NEEDED, if not SUP code
+	/* FIXME - STILL NEEDED ?, if not SUP code
 
 	// XXX - temporary hack because -gui-apikey seems to correctly handle by
 	// syncthing the early first time
@@ -370,7 +388,7 @@ func (s *SyncThing) Connect() error {
 	s.Connected = true
 
 	// Start events monitoring
-	//SEB TODO err = s.Events.Start()
+	err = s.Events.Start()
 
 	return err
 }