Fix syncthing logger
authorSebastien Douheret <sebastien.douheret@iot.bzh>
Fri, 6 Oct 2017 16:08:05 +0000 (18:08 +0200)
committerSebastien Douheret <sebastien.douheret@iot.bzh>
Mon, 6 Nov 2017 14:57:03 +0000 (15:57 +0100)
glide.yaml
lib/syncthing/st.go

index e017281..08a3fed 100644 (file)
@@ -25,7 +25,7 @@ import:
 - package: github.com/satori/go.uuid
   version: ^1.1.0
 - package: github.com/iotbzh/xds-common
-  version: 4b8e35b6786b
+  version: 1bf428d6b4ba
   subpackages:
   - golib/common
   - golib/eows
index e8e9f44..b14f40d 100644 (file)
@@ -316,7 +316,12 @@ func (s *SyncThing) Connect() error {
                common.HTTPClientConfig{
                        URLPrefix:           "/rest",
                        HeaderClientKeyName: "X-Syncthing-ID",
+                       LogOut:              s.conf.LogVerboseOut,
+                       LogPrefix:           "SYNCTHING: ",
+                       LogLevel:            common.HTTPLogLevelWarning,
                })
+       s.client.SetLogLevel(s.log.Level.String())
+
        if err != nil {
                msg := ": " + err.Error()
                if strings.Contains(err.Error(), "connection refused") {
@@ -328,11 +333,6 @@ func (s *SyncThing) Connect() error {
                return fmt.Errorf("ERROR: cannot connect to Syncthing (null client)")
        }
 
-       // Redirect HTTP log into a file
-       s.client.SetLogLevel(s.conf.Log.Level.String())
-       s.client.LoggerPrefix = "SYNCTHING: "
-       s.client.LoggerOut = s.conf.LogVerboseOut
-
        s.MyID, err = s.IDGet()
        if err != nil {
                return fmt.Errorf("ERROR: cannot retrieve ID")