X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=main.go;h=32083bbd41045c000486cc999a3c74a580984b7a;hb=777204d72f9d184e4416f943d8a1a38051dfb5ae;hp=eeb40363c1e71554967ce8f97e38b0f641e79cdd;hpb=bb1c21ff73153633eb4b62f35aaaa610165a3862;p=src%2Fxds%2Fxds-agent.git diff --git a/main.go b/main.go index eeb4036..32083bb 100644 --- a/main.go +++ b/main.go @@ -12,8 +12,8 @@ import ( "github.com/codegangsta/cli" "github.com/iotbzh/xds-agent/lib/agent" "github.com/iotbzh/xds-agent/lib/syncthing" + "github.com/iotbzh/xds-agent/lib/webserver" "github.com/iotbzh/xds-agent/lib/xdsconfig" - "github.com/iotbzh/xds-agent/lib/xdsserver" ) const ( @@ -66,12 +66,13 @@ func xdsAgent(cliCtx *cli.Context) error { // Establish connection with local Syncthing (retry if connection fail) time.Sleep(3 * time.Second) - retry := 10 + maxRetry := 30 + retry := maxRetry for retry > 0 { if err := ctx.SThg.Connect(); err == nil { break } - ctx.Log.Infof("Establishing connection to Syncthing (retry %d/10)", retry) + ctx.Log.Infof("Establishing connection to Syncthing (retry %d/%d)", retry, maxRetry) time.Sleep(time.Second) retry-- } @@ -87,7 +88,7 @@ func xdsAgent(cliCtx *cli.Context) error { ctx.Log.Infof("Local Syncthing ID: %s", id) // Create and start Web Server - ctx.WWWServer = xdsserver.NewServer(ctx.Config, ctx.Log) + ctx.WWWServer = webserver.New(ctx.Config, ctx.Log) if err = ctx.WWWServer.Serve(); err != nil { log.Println(err) return cli.NewExitError(err, 3)