Fixed xds-server folder events detection.

[src/xds/xds-agent.git] / lib / agent / agent.go

diff --git a/lib/agent/agent.go b/lib/agent/agent.go
index e34dd63..989c9a0 100644 (file)
--- a/lib/agent/agent.go
+++ b/lib/agent/agent.go
@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2017 "IoT.bzh"
+ * Author Sebastien Douheret <sebastien@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package agent
 
 import (
@@ -24,6 +41,7 @@ type Context struct {
        Config        *xdsconfig.Config
        Log           *logrus.Logger
        LogLevelSilly bool
+       LogSillyf     func(format string, args ...interface{})
        SThg          *st.SyncThing
        SThgCmd       *exec.Cmd
        SThgInotCmd   *exec.Cmd
@@ -54,13 +72,21 @@ func NewAgent(cliCtx *cli.Context) *Context {
        }
        log.Formatter = &logrus.TextFormatter{}
 
+       // Support silly logging (printed on log.debug)
        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,
                Log:           log,
-               LogLevelSilly: (sillyLog && sillyVal == "1"),
+               LogLevelSilly: logSilly,
+               LogSillyf:     sillyFunc,
                Exit:          make(chan os.Signal, 1),
 
                webServer:  nil,
@@ -106,7 +132,10 @@ func (ctx *Context) Run() (int, error) {
                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 agent-config.json
        if ctx.Config.FileConf.SThgConf != nil {
                ctx.SThg = st.NewSyncThing(ctx.Config, ctx.Log)
        }
@@ -160,9 +189,6 @@ func (ctx *Context) Run() (int, error) {
        // Sessions manager
        ctx.sessions = NewClientSessions(ctx, cookieMaxAge)
 
-       // Create events management
-       ctx.events = NewEvents(ctx)
-
        // Create projects management
        ctx.projects = NewProjects(ctx, ctx.SThg)