X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=main.go;h=36d9af44aedf909be3ca2754506cb7dfdafa7cab;hb=32791ffed5bdfaa698e90f9c067dc6e8ababbfc3;hp=93d13a26ef9e4f18d8725f8cc1f04f924b369010;hpb=bfeab33538d50ee52750de4dd4c0e72b64f674f6;p=src%2Fxds%2Fxds-agent.git

diff --git a/main.go b/main.go
index 93d13a2..36d9af4 100644
--- a/main.go
+++ b/main.go
@@ -3,18 +3,12 @@
 package main
 
 import (
-	"log"
 	"os"
-	"time"
-
-	"fmt"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/codegangsta/cli"
+	"github.com/urfave/cli"
 	"github.com/iotbzh/xds-agent/lib/agent"
-	"github.com/iotbzh/xds-agent/lib/syncthing"
 	"github.com/iotbzh/xds-agent/lib/xdsconfig"
-	"github.com/iotbzh/xds-agent/lib/xdsserver"
 )
 
 const (
@@ -37,65 +31,21 @@ var AppSubVersion = "unknown-dev"
 
 // xdsAgent main routine
 func xdsAgent(cliCtx *cli.Context) error {
+	var err error
 
 	// Create Agent context
-	ctx := agent.NewAgent(cliCtx)
+	ctxAgent := agent.NewAgent(cliCtx)
 
 	// Load config
-	cfg, 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.Log.Infof("Starting Syncthing...")
-	ctx.SThgCmd, err = ctx.SThg.Start()
-	if err != nil {
-		return cli.NewExitError(err, 2)
-	}
-	ctx.Log.Infof("Syncthing started (PID %d)", ctx.SThgCmd.Process.Pid)
-
-	ctx.Log.Infof("Starting Syncthing-inotify...")
-	ctx.SThgInotCmd, err = ctx.SThg.StartInotify()
+	ctxAgent.Config, err = xdsconfig.Init(cliCtx, ctxAgent.Log)
 	if err != nil {
 		return cli.NewExitError(err, 2)
 	}
-	ctx.Log.Infof("Syncthing-inotify started (PID %d)", ctx.SThgInotCmd.Process.Pid)
-
-	// Establish connection with local Syncthing (retry if connection fail)
-	time.Sleep(3 * time.Second)
-	retry := 10
-	for retry > 0 {
-		if err := ctx.SThg.Connect(); err == nil {
-			break
-		}
-		ctx.Log.Infof("Establishing connection to Syncthing (retry %d/5)", retry)
-		time.Sleep(time.Second)
-		retry--
-	}
-	if ctx.SThg == nil {
-		err = fmt.Errorf("ERROR: cannot connect to Syncthing (url: %s)", ctx.SThg.BaseURL)
-		return cli.NewExitError(err, 2)
-	}
-
-	// Retrieve Syncthing config
-	id, err := ctx.SThg.IDGet()
-	if err != nil {
-		return cli.NewExitError(err, 2)
-	}
-	ctx.Log.Infof("Local Syncthing ID: %s", id)
 
-	// Create and start Web Server
-	ctx.WWWServer = xdsserver.NewServer(ctx.Config, ctx.Log)
-	if err = ctx.WWWServer.Serve(); err != nil {
-		log.Println(err)
-		return cli.NewExitError(err, 3)
-	}
+	// Run Agent (main loop)
+	errCode, err := ctxAgent.Run()
 
-	return cli.NewExitError("Program exited ", 4)
+	return cli.NewExitError(err, errCode)
 }
 
 // main
@@ -127,7 +77,13 @@ func main() {
 			Name:   "log, l",
 			Value:  "error",
 			Usage:  "logging level (supported levels: panic, fatal, error, warn, info, debug)\n\t",
-			EnvVar: "LOG_LEVEL",
+			EnvVar: "XDS_LOGLEVEL",
+		},
+		cli.StringFlag{
+			Name:   "logfile",
+			Value:  "stdout",
+			Usage:  "filename where logs will be redirected (default stdout)\n\t",
+			EnvVar: "XDS_LOGFILE",
 		},
 	}