X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fxdsserver%2Fxdsserver.go;h=b6c6f2f593edaca6a127947aec4c69e70440f568;hb=5dc2ff003106f0ced38caadb06033f24c792f9b9;hp=1079ebafb83606271e512f8b24c9d269827c17d6;hpb=65e09e831cf13343ac713fbf15281174d1f13a94;p=src%2Fxds%2Fxds-server.git diff --git a/lib/xdsserver/xdsserver.go b/lib/xdsserver/xdsserver.go index 1079eba..b6c6f2f 100644 --- a/lib/xdsserver/xdsserver.go +++ b/lib/xdsserver/xdsserver.go @@ -26,9 +26,9 @@ 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" + 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" ) @@ -37,22 +37,23 @@ 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 - targets *Targets - 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 @@ -206,6 +208,10 @@ func (ctx *Context) Run() (int, error) { // Sessions manager 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 { ctx.Log.Println(err)