X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fagent%2Fagent.go;h=506976dd10344f161a2201818db82bc233e98eab;hb=247bb7c2db5f0d48178398599348249bf886ebbc;hp=58a2ba02f727219d0aadad02c51860fbf46ba21a;hpb=f75d24ca885690289c16adeac0e5c5e7bb56e36c;p=src%2Fxds%2Fxds-agent.git

diff --git a/lib/agent/agent.go b/lib/agent/agent.go
index 58a2ba0..506976d 100644
--- a/lib/agent/agent.go
+++ b/lib/agent/agent.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 "IoT.bzh"
+ * Copyright (C) 2017-2018 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,9 +27,10 @@ import (
 	"syscall"
 	"time"
 
+	st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/syncthing"
+
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
 	"github.com/Sirupsen/logrus"
-	"github.com/iotbzh/xds-agent/lib/syncthing"
-	"github.com/iotbzh/xds-agent/lib/xdsconfig"
 	"github.com/urfave/cli"
 )
 
@@ -46,11 +47,12 @@ type Context struct {
 	SThgCmd       *exec.Cmd
 	SThgInotCmd   *exec.Cmd
 
-	webServer  *WebServer
-	xdsServers map[string]*XdsServer
-	sessions   *Sessions
-	events     *Events
-	projects   *Projects
+	webServer     *WebServer
+	xdsServers    map[string]*XdsServer
+	XdsSupervisor *XdsSupervisor
+	sessions      *Sessions
+	events        *Events
+	projects      *Projects
 
 	Exit chan os.Signal
 }
@@ -132,7 +134,10 @@ func (ctx *Context) Run() (int, error) {
 		ctx._logPrint("Logging file for HTTP requests: %s\n", logFileHTTPReq)
 	}
 
-	// Create syncthing instance when section "syncthing" is present in config.json
+	// Create events management
+	ctx.events = NewEvents(ctx)
+
+	// Create syncthing instance when section "syncthing" is present in agent-config.json
 	if ctx.Config.FileConf.SThgConf != nil {
 		ctx.SThg = st.NewSyncThing(ctx.Config, ctx.Log)
 	}
@@ -186,9 +191,6 @@ func (ctx *Context) Run() (int, error) {
 	// Sessions manager
 	ctx.sessions = NewClientSessions(ctx, cookieMaxAge)
 
-	// Create events management
-	ctx.events = NewEvents(ctx)
-
 	// Create projects management
 	ctx.projects = NewProjects(ctx, ctx.SThg)