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
bb8f755
..
1079eba
100644
(file)
--- a/
lib/xdsserver/xdsserver.go
+++ b/
lib/xdsserver/xdsserver.go
@@
-48,6
+48,7
@@
type Context struct {
SThgInotCmd *exec.Cmd
mfolders *Folders
sdks *SDKs
SThgInotCmd *exec.Cmd
mfolders *Folders
sdks *SDKs
+ targets *Targets
WWWServer *WebServer
sessions *Sessions
events *Events
WWWServer *WebServer
sessions *Sessions
events *Events
@@
-129,7
+130,7
@@
func (ctx *Context) Run() (int, error) {
}
// Create events management
}
// 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 {
// Create syncthing instance when section "syncthing" is present in server-config.json
if ctx.Config.FileConf.SThgConf != nil {
@@
-178,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 {
@@
-186,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 {