Use go module as dependency tool instead of glide

[src/xds/xds-server.git] / lib / xdsserver / xdsserver.go

diff --git a/lib/xdsserver/xdsserver.go b/lib/xdsserver/xdsserver.go
index 46e860b..b6c6f2f 100644 (file)
--- 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,33 +26,34 @@ import (
        "syscall"
        "time"
 
+       st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/syncthing"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/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"
 
 // Context holds the XDS server context
 type Context struct {
-       ProgName      string
-       Cli           *cli.Context
-       Config        *xdsconfig.Config
-       Log           *logrus.Logger
-       LogLevelSilly bool
-       LogSillyf     func(format string, args ...interface{})
-       SThg          *st.SyncThing
-       SThgCmd       *exec.Cmd
-       SThgInotCmd   *exec.Cmd
-       mfolders      *Folders
-       sdks          *SDKs
-       WWWServer     *WebServer
-       sessions      *Sessions
-       events        *Events
-       Exit          chan os.Signal
+       ProgName         string
+       Cli              *cli.Context
+       Config           *xdsconfig.Config
+       Log              *logrus.Logger
+       LogLevelSilly    bool
+       LogSillyf        func(format string, args ...interface{})
+       SThg             *st.SyncThing
+       SThgCmd          *exec.Cmd
+       SThgInotCmd      *exec.Cmd
+       mfolders         *Folders
+       sdks             *SDKs
+       targets          *Targets
+       WWWServer        *WebServer
+       sessions         *Sessions
+       events           *Events
+       lockXdsSrvUpdate LockXdsUpdate
+       Exit             chan os.Signal
 }
 
 // NewXdsServer Create a new instance of XDS server
@@ -83,12 +84,13 @@ func NewXdsServer(cliCtx *cli.Context) *Context {
 
        // Define default configuration
        ctx := Context{
-               ProgName:      cliCtx.App.Name,
-               Cli:           cliCtx,
-               Log:           log,
-               LogLevelSilly: logSilly,
-               LogSillyf:     sillyFunc,
-               Exit:          make(chan os.Signal, 1),
+               ProgName:         cliCtx.App.Name,
+               Cli:              cliCtx,
+               Log:              log,
+               LogLevelSilly:    logSilly,
+               LogSillyf:        sillyFunc,
+               lockXdsSrvUpdate: LockXdsUpdate{LockCpt: 0},
+               Exit:             make(chan os.Signal, 1),
        }
 
        // register handler on SIGTERM / exit
@@ -130,7 +132,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 +181,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 +189,28 @@ 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)
+
+       // Check if a new package version is available
+       // and monitor updates
+       MonitorUpdates(ctx)
 
        // Run Web Server until exit requested (blocking call)
        if err = ctx.WWWServer.Serve(); err != nil {