Refit source files to have a public xs-apiv1 lib package.

[src/xds/xds-server.git] / main.go

diff --git a/main.go b/main.go
index 40617d1..1bb7110 100644 (file)
--- a/main.go
+++ b/main.go
@@ -3,7 +3,7 @@
 package main
 
 import (
-       "log"
+       "fmt"
        "os"
 
        "github.com/Sirupsen/logrus"
@@ -30,23 +30,23 @@ var AppVersion = "?.?.?"
 // Should be set by compilation -ldflags "-X main.AppSubVersion=xxx"
 var AppSubVersion = "unknown-dev"
 
-// Web server main routine
-func webServer(ctx *cli.Context) error {
+// XDS Server application main routine
+func xdsApp(cliCtx *cli.Context) error {
+       var err error
 
-       // Init config
-       cfg, err := xdsconfig.Init(ctx)
+       // Create XDS server context
+       ctxSvr := xdsserver.NewXdsServer(cliCtx)
+
+       // Load config
+       ctxSvr.Config, err = xdsconfig.Init(cliCtx, ctxSvr.Log)
        if err != nil {
-               return cli.NewExitError(err, 2)
+               return cli.NewExitError(err, -2)
        }
 
-       // Create and start Web Server
-       svr := xdsserver.NewServer(cfg)
-       if err = svr.Serve(); err != nil {
-               log.Println(err)
-               return cli.NewExitError(err, 3)
-       }
+       // Run XDS Server (main loop)
+       errCode, err := ctxSvr.Run()
 
-       return cli.NewExitError("Program exited ", 4)
+       return cli.NewExitError(err, errCode)
 }
 
 // main
@@ -80,10 +80,21 @@ func main() {
                        Usage:  "logging level (supported levels: panic, fatal, error, warn, info, debug)\n\t",
                        EnvVar: "LOG_LEVEL",
                },
+               cli.StringFlag{
+                       Name:   "logfile",
+                       Value:  "stdout",
+                       Usage:  "filename where logs will be redirected (default stdout)\n\t",
+                       EnvVar: "LOG_FILENAME",
+               },
+               cli.BoolFlag{
+                       Name:   "no-folderconfig, nfc",
+                       Usage:  fmt.Sprintf("Do not read folder config file (%s)\n\t", xdsconfig.FoldersConfigFilename),
+                       EnvVar: "NO_FOLDERCONFIG",
+               },
        }
 
        // only one action: Web Server
-       app.Action = webServer
+       app.Action = xdsApp
 
        app.Run(os.Args)
 }