aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-08-25 00:21:26 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-08-25 00:21:54 +0200
commit21b070dd7d65cd60217e446810559ec241d0b826 (patch)
tree0ab9bfede6ba45884cdfc426c1dccab182241a36
parentf9123dd7e633cdce66d7d0c55aa12bdca00c9406 (diff)
Fixed xds-common version and use last one
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--glide.yaml1
-rw-r--r--lib/syncthing/st.go4
-rw-r--r--main.go2
3 files changed, 5 insertions, 2 deletions
diff --git a/glide.yaml b/glide.yaml
index 3661d8f..652e51c 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -22,5 +22,6 @@ import:
- package: github.com/satori/go.uuid
version: ^1.1.0
- package: github.com/iotbzh/xds-common
+ version: 4b8e35b6786b
subpackages:
- golib/common
diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 53e4688..a750036 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -300,7 +300,9 @@ func (s *SyncThing) Connect() error {
return fmt.Errorf("ERROR: cannot connect to Syncthing (null client)")
}
- s.client.SetLogger(s.log)
+ s.client.SetLogLevel(s.log.Level.String())
+ s.client.LoggerPrefix = "SYNCTHING: "
+ s.client.LoggerOut = s.log.Out
return nil
}
diff --git a/main.go b/main.go
index d3722e2..32083bb 100644
--- a/main.go
+++ b/main.go
@@ -72,7 +72,7 @@ func xdsAgent(cliCtx *cli.Context) error {
if err := ctx.SThg.Connect(); err == nil {
break
}
- ctx.Log.Infof("Establishing connection to Syncthing (retry %d/%d", retry, maxRetry)
+ ctx.Log.Infof("Establishing connection to Syncthing (retry %d/%d)", retry, maxRetry)
time.Sleep(time.Second)
retry--
}