Add LowCollector & rename Supervisor to Monitoring

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

diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index ef94f0a..6a5e750 100644 (file)
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2018 "IoT.bzh"
+ * Copyright (C) 2017-2019 "IoT.bzh"
  * Author Sebastien Douheret <sebastien@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,7 @@ import (
 
        "os"
 
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/Sirupsen/logrus"
        uuid "github.com/satori/go.uuid"
        "github.com/urfave/cli"
@@ -92,10 +92,14 @@ func Init(ctx *cli.Context, log *logrus.Logger) (*Config, error) {
                                Home: defaultSTHomeDir,
                        },
                        ProfileConf: ProfileConfT{
-                               XDSBinder: XDSBinderConf{
+                               XDSMonitoring: XDSMonitoringConf{
                                        URL:       "http://localhost:8810",
                                        ConnRetry: 10,
                                },
+                               XDSLowCollector: XDSLowCollectorConf{
+                                       URL:       "http://localhost:8820",
+                                       ConnRetry: 10,
+                               },
                        },
                },
                Log: log,
@@ -112,11 +116,18 @@ func Init(ctx *cli.Context, log *logrus.Logger) (*Config, error) {
        // Handle where Logs are redirected:
        //  default 'stdout' (logfile option default value)
        //  else use file (or filepath) set by --logfile option
-       //  that may be overwritten by LogsDir field of config file
+       //  else use LogsDir field of config file
        logF := c.Options.LogFile
        logD := c.FileConf.LogsDir
        if logF != "stdout" {
-               if logD != "" {
+               if logF != "" {
+                       if common.IsDir(logF) {
+                               logD = logF
+                               logF = filepath.Join(logF, "xds-agent.log")
+                       } else {
+                               logD = filepath.Dir(logF)
+                       }
+               } else if logD != "" {
                        lf := filepath.Base(logF)
                        if lf == "" || lf == "." {
                                lf = "xds-agent.log"