X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fsyncthing%2Fst.go;h=957dd6533167edbf936f93f2c81cf6d285efa094;hb=0805255ee01103c500f2aae8845850b3dae6a0b6;hp=15cab0da1fd770f8c6ee469005d5b3a2cdb96a11;hpb=c07adb807c41a1545a9a0f5bbf40080d86946538;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 15cab0d..957dd65 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -15,6 +15,10 @@ import (
 
 	"io"
 
+	"io/ioutil"
+
+	"regexp"
+
 	"github.com/Sirupsen/logrus"
 	"github.com/iotbzh/xds-server/lib/common"
 	"github.com/iotbzh/xds-server/lib/xdsconfig"
@@ -27,13 +31,16 @@ type SyncThing struct {
 	APIKey  string
 	Home    string
 	STCmd   *exec.Cmd
+	STICmd  *exec.Cmd
 
 	// Private fields
-	binDir     string
-	logsDir    string
-	exitSTChan chan ExitChan
-	client     *common.HTTPClient
-	log        *logrus.Logger
+	binDir      string
+	logsDir     string
+	exitSTChan  chan ExitChan
+	exitSTIChan chan ExitChan
+	conf        *xdsconfig.Config
+	client      *common.HTTPClient
+	log         *logrus.Logger
 }
 
 // ExitChan Channel used for process exit
@@ -79,6 +86,7 @@ func NewSyncThing(conf *xdsconfig.Config, log *logrus.Logger) *SyncThing {
 		binDir:  binDir,
 		logsDir: conf.FileConf.LogsDir,
 		log:     log,
+		conf:    conf,
 	}
 
 	return &s
@@ -170,9 +178,48 @@ 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
+	if s.APIKey == "" {
+		if fd, err := os.Open(filepath.Join(s.Home, "config.xml")); err == nil {
+			defer fd.Close()
+			if b, err := ioutil.ReadAll(fd); err == nil {
+				re := regexp.MustCompile("<apikey>(.*)</apikey>")
+				key := re.FindStringSubmatch(string(b))
+				if len(key) >= 1 {
+					s.APIKey = key[1]
+				}
+			}
+		}
+	}
+
 	return s.STCmd, err
 }
 
+// StartInotify Starts syncthing-inotify process
+func (s *SyncThing) StartInotify() (*exec.Cmd, error) {
+	var err error
+	exeName := "syncthing-inotify"
+
+	s.log.Infof(" STI  url=%s", s.BaseURL)
+
+	args := []string{
+		"-target=" + s.BaseURL,
+	}
+	if s.APIKey != "" {
+		args = append(args, "-api="+s.APIKey)
+		s.log.Infof("%s uses apikey=%s", exeName, s.APIKey)
+	}
+	if s.log.Level == logrus.DebugLevel {
+		args = append(args, "-verbosity=4")
+	}
+
+	env := []string{}
+
+	s.STICmd, err = s.startProc(exeName, args, env, &s.exitSTIChan)
+
+	return s.STICmd, err
+}
+
 func (s *SyncThing) stopProc(pname string, proc *os.Process, exit chan ExitChan) {
 	if err := proc.Signal(os.Interrupt); err != nil {
 		s.log.Infof("Proc interrupt %s error: %s", pname, err.Error())
@@ -199,6 +246,15 @@ func (s *SyncThing) Stop() {
 	s.STCmd = nil
 }
 
+// StopInotify Stops syncthing process
+func (s *SyncThing) StopInotify() {
+	if s.STICmd == nil {
+		return
+	}
+	s.stopProc("syncthing-inotify", s.STICmd.Process, s.exitSTIChan)
+	s.STICmd = nil
+}
+
 // Connect Establish HTTP connection with Syncthing
 func (s *SyncThing) Connect() error {
 	var err error
@@ -217,6 +273,9 @@ func (s *SyncThing) Connect() error {
 	if s.client == nil {
 		return fmt.Errorf("ERROR: cannot connect to Syncthing (null client)")
 	}
+
+	s.client.SetLogger(s.log)
+
 	return nil
 }