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
Migration to AGL gerrit (update go import)
[src/xds/xds-server.git]
/
lib
/
xdsserver
/
xdsserver.go
diff --git
a/lib/xdsserver/xdsserver.go
b/lib/xdsserver/xdsserver.go
index
33efa26
..
bb8f755
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"
@@
-43,6
+42,7
@@
type Context struct {
Config *xdsconfig.Config
Log *logrus.Logger
LogLevelSilly bool
Config *xdsconfig.Config
Log *logrus.Logger
LogLevelSilly bool
+ LogSillyf func(format string, args ...interface{})
SThg *st.SyncThing
SThgCmd *exec.Cmd
SThgInotCmd *exec.Cmd
SThg *st.SyncThing
SThgCmd *exec.Cmd
SThgInotCmd *exec.Cmd
@@
-50,6
+50,7
@@
type Context struct {
sdks *SDKs
WWWServer *WebServer
sessions *Sessions
sdks *SDKs
WWWServer *WebServer
sessions *Sessions
+ events *Events
Exit chan os.Signal
}
Exit chan os.Signal
}
@@
-70,14
+71,22
@@
func NewXdsServer(cliCtx *cli.Context) *Context {
}
log.Formatter = &logrus.TextFormatter{}
}
log.Formatter = &logrus.TextFormatter{}
+ // Support silly logging (printed on log.debug)
sillyVal, sillyLog := os.LookupEnv("XDS_LOG_SILLY")
sillyVal, sillyLog := os.LookupEnv("XDS_LOG_SILLY")
+ logSilly := sillyLog && sillyVal == "1"
+ sillyFunc := func(format string, args ...interface{}) {
+ if logSilly {
+ log.Debugf("SILLY: "+format, args...)
+ }
+ }
// Define default configuration
ctx := Context{
ProgName: cliCtx.App.Name,
Cli: cliCtx,
Log: log,
// Define default configuration
ctx := Context{
ProgName: cliCtx.App.Name,
Cli: cliCtx,
Log: log,
- LogLevelSilly: (sillyLog && sillyVal == "1"),
+ LogLevelSilly: logSilly,
+ LogSillyf: sillyFunc,
Exit: make(chan os.Signal, 1),
}
Exit: make(chan os.Signal, 1),
}
@@
-119,7
+128,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 = NewEvents(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)
}