X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fxdsserver.go;h=1079ebafb83606271e512f8b24c9d269827c17d6;hb=f870de867b43bfb1220067f81c11395438fb2863;hp=46e860b2790f34c496b9150d66aa950a37be2892;hpb=285332c351777b74abca638b8b2a2cde3c68edc6;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/xdsserver/xdsserver.go b/lib/xdsserver/xdsserver.go
index 46e860b..1079eba 100644
--- a/lib/xdsserver/xdsserver.go
+++ b/lib/xdsserver/xdsserver.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");
@@ -26,12 +26,11 @@ import (
 	"syscall"
 	"time"
 
+	st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
+	"gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
 	"github.com/Sirupsen/logrus"
 	"github.com/codegangsta/cli"
-	"github.com/iotbzh/xds-server/lib/xsapiv1"
-
-	"github.com/iotbzh/xds-server/lib/syncthing"
-	"github.com/iotbzh/xds-server/lib/xdsconfig"
 )
 
 const cookieMaxAge = "3600"
@@ -49,6 +48,7 @@ type Context struct {
 	SThgInotCmd   *exec.Cmd
 	mfolders      *Folders
 	sdks          *SDKs
+	targets       *Targets
 	WWWServer     *WebServer
 	sessions      *Sessions
 	events        *Events
@@ -130,7 +130,7 @@ func (ctx *Context) Run() (int, error) {
 	}
 
 	// Create events management
-	ctx.events = NewEvents(ctx)
+	ctx.events = EventsConstructor(ctx)
 
 	// Create syncthing instance when section "syncthing" is present in server-config.json
 	if ctx.Config.FileConf.SThgConf != nil {
@@ -179,7 +179,7 @@ func (ctx *Context) Run() (int, error) {
 	}
 
 	// Init model folder
-	ctx.mfolders = FoldersNew(ctx)
+	ctx.mfolders = FoldersConstructor(ctx)
 
 	// Load initial folders config from disk
 	if err := ctx.mfolders.LoadConfig(); err != nil {
@@ -187,16 +187,24 @@ func (ctx *Context) Run() (int, error) {
 	}
 
 	// Init cross SDKs
-	ctx.sdks, err = NewSDKs(ctx)
+	ctx.sdks, err = SDKsConstructor(ctx)
 	if err != nil {
 		return -6, err
 	}
 
+	// Init target and terminals model
+	ctx.targets = TargetsConstructor(ctx)
+
+	// Load initial target & terminal config
+	if err := ctx.targets.LoadConfig(); err != nil {
+		return -6, err
+	}
+
 	// Create Web Server
-	ctx.WWWServer = NewWebServer(ctx)
+	ctx.WWWServer = WebServerConstructor(ctx)
 
 	// Sessions manager
-	ctx.sessions = NewClientSessions(ctx, cookieMaxAge)
+	ctx.sessions = ClientSessionsConstructor(ctx, cookieMaxAge)
 
 	// Run Web Server until exit requested (blocking call)
 	if err = ctx.WWWServer.Serve(); err != nil {