aboutsummaryrefslogtreecommitdiffstats
path: root/main.go
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2017-05-17 17:10:45 +0200
committerSebastien Douheret <sebastien.douheret@iot.bzh>2017-05-17 17:10:45 +0200
commita50baa7c309f7eb55fe87c71f4c688ace325b6ac (patch)
tree14ed08e3abad729bce718bfbd596eb62d1676675 /main.go
parent59784289d1d0296e470c46dc279aa3576c60801e (diff)
Add logsDir setting and more
- add logsDir setting in config.json - redirect Syncthing and Syncthing-inotify into log files - Use autogenerated Syncthing apikey if gui-apikey not set in config.json
Diffstat (limited to 'main.go')
-rw-r--r--main.go13
1 files changed, 5 insertions, 8 deletions
diff --git a/main.go b/main.go
index 93d13a2..0a0ad0a 100644
--- a/main.go
+++ b/main.go
@@ -7,8 +7,6 @@ import (
"os"
"time"
- "fmt"
-
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
"github.com/iotbzh/xds-agent/lib/agent"
@@ -37,19 +35,19 @@ var AppSubVersion = "unknown-dev"
// xdsAgent main routine
func xdsAgent(cliCtx *cli.Context) error {
+ var err error
// Create Agent context
ctx := agent.NewAgent(cliCtx)
// Load config
- cfg, err := xdsconfig.Init(cliCtx, ctx.Log)
+ ctx.Config, err = xdsconfig.Init(cliCtx, ctx.Log)
if err != nil {
return cli.NewExitError(err, 2)
}
- ctx.Config = &cfg
// Start local instance of Syncthing and Syncthing-notify
- ctx.SThg = st.NewSyncThing(ctx.Config.FileConf.SThgConf, ctx.Log)
+ ctx.SThg = st.NewSyncThing(ctx.Config, ctx.Log)
ctx.Log.Infof("Starting Syncthing...")
ctx.SThgCmd, err = ctx.SThg.Start()
@@ -72,12 +70,11 @@ func xdsAgent(cliCtx *cli.Context) error {
if err := ctx.SThg.Connect(); err == nil {
break
}
- ctx.Log.Infof("Establishing connection to Syncthing (retry %d/5)", retry)
+ ctx.Log.Infof("Establishing connection to Syncthing (retry %d/10)", retry)
time.Sleep(time.Second)
retry--
}
- if ctx.SThg == nil {
- err = fmt.Errorf("ERROR: cannot connect to Syncthing (url: %s)", ctx.SThg.BaseURL)
+ if err != nil || retry == 0 {
return cli.NewExitError(err, 2)
}