Bump 0.2.0

[src/xds/xds-agent.git] / main.go

diff --git a/main.go b/main.go
index 0a0ad0a..32083bb 100644 (file)
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@
 package main
 
 import (
+       "fmt"
        "log"
        "os"
        "time"
@@ -11,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 (
@@ -54,23 +55,24 @@ func xdsAgent(cliCtx *cli.Context) error {
        if err != nil {
                return cli.NewExitError(err, 2)
        }
-       ctx.Log.Infof("Syncthing started (PID %d)", ctx.SThgCmd.Process.Pid)
+       fmt.Printf("Syncthing started (PID %d)\n", ctx.SThgCmd.Process.Pid)
 
        ctx.Log.Infof("Starting Syncthing-inotify...")
        ctx.SThgInotCmd, err = ctx.SThg.StartInotify()
        if err != nil {
                return cli.NewExitError(err, 2)
        }
-       ctx.Log.Infof("Syncthing-inotify started (PID %d)", ctx.SThgInotCmd.Process.Pid)
+       fmt.Printf("Syncthing-inotify started (PID %d)\n", ctx.SThgInotCmd.Process.Pid)
 
        // 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--
        }
@@ -86,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)