X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fst.go;h=c4b72c500189ef135921776911a7f58c1895ed96;hb=57bdfc8349b3c8a727d6f439e1fd12661bc00a15;hp=304cfca5fe9af83c4cce78485c963d416fb9c835;hpb=90992bcc039d2b982ad6df18cf3188b53f939368;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 304cfca..c4b72c5 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,7 +147,7 @@ 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") != "" {
+	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()
 	}
@@ -227,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
@@ -261,7 +278,7 @@ func (s *SyncThing) Start() (*exec.Cmd, error) {
 	*/
 	s.STCmd, err = s.startProc("syncthing", args, env, &s.exitSTChan)
 
-	// Use autogenerated apikey if not set by config.json
+	// Use autogenerated apikey if not set by agent-config.json
 	if err == nil && s.APIKey == "" {
 		if fd, err := os.Open(filepath.Join(s.Home, "config.xml")); err == nil {
 			defer fd.Close()
@@ -371,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
 }