Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added target and terminal support.
[src/xds/xds-server.git]
/
lib
/
xdsserver
/
xdsserver.go
diff --git
a/lib/xdsserver/xdsserver.go
b/lib/xdsserver/xdsserver.go
index
5079553
..
1079eba
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");
* Author Sebastien Douheret <sebastien@iot.bzh>
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@
-26,12
+26,11
@@
import (
"syscall"
"time"
"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/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"
)
const cookieMaxAge = "3600"
@@
-49,8
+48,10
@@
type Context struct {
SThgInotCmd *exec.Cmd
mfolders *Folders
sdks *SDKs
SThgInotCmd *exec.Cmd
mfolders *Folders
sdks *SDKs
+ targets *Targets
WWWServer *WebServer
sessions *Sessions
WWWServer *WebServer
sessions *Sessions
+ events *Events
Exit chan os.Signal
}
Exit chan os.Signal
}
@@
-128,7
+129,10
@@
func (ctx *Context) Run() (int, error) {
ctx._logPrint("Logging file for HTTP requests: %s\n", logFileHTTPReq)
}
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 = EventsConstructor(ctx)
+
+ // Create syncthing instance when section "syncthing" is present in server-config.json
if ctx.Config.FileConf.SThgConf != nil {
ctx.SThg = st.NewSyncThing(ctx.Config, ctx.Log)
}
if ctx.Config.FileConf.SThgConf != nil {
ctx.SThg = st.NewSyncThing(ctx.Config, ctx.Log)
}
@@
-175,7
+179,7
@@
func (ctx *Context) Run() (int, error) {
}
// Init model folder
}
// Init model folder
- ctx.mfolders = Folders
New
(ctx)
+ ctx.mfolders = Folders
Constructor
(ctx)
// Load initial folders config from disk
if err := ctx.mfolders.LoadConfig(); err != nil {
// Load initial folders config from disk
if err := ctx.mfolders.LoadConfig(); err != nil {
@@
-183,16
+187,24
@@
func (ctx *Context) Run() (int, error) {
}
// Init cross SDKs
}
// Init cross SDKs
- ctx.sdks, err =
NewSDKs
(ctx)
+ ctx.sdks, err =
SDKsConstructor
(ctx)
if err != nil {
return -6, err
}
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
// Create Web Server
- ctx.WWWServer =
NewWebServe
r(ctx)
+ ctx.WWWServer =
WebServerConstructo
r(ctx)
// Sessions manager
// 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 {
// Run Web Server until exit requested (blocking call)
if err = ctx.WWWServer.Serve(); err != nil {