Set install dir to /opt/AGL and move conf to $HOME/.xds-server

[src/xds/xds-server.git] / lib / webserver / server.go

diff --git a/lib/webserver/server.go b/lib/webserver/server.go
index 5183208..a2fdf6f 100644 (file)
--- a/lib/webserver/server.go
+++ b/lib/webserver/server.go
@@ -46,10 +46,10 @@ func New(cfg *xdsconfig.Config, mfolders *model.Folders, sdks *crosssdk.SDKs, lo
                gin.SetMode(gin.ReleaseMode)
        }
 
-       // Redirect gin logs into logrus logger
-       gin.DefaultWriter = logr.Out
-       gin.DefaultErrorWriter = logr.Out
-       log.SetOutput(logr.Out)
+       // Redirect gin logs into another logger (LogVerboseOut may be stderr or a file)
+       gin.DefaultWriter = cfg.LogVerboseOut
+       gin.DefaultErrorWriter = cfg.LogVerboseOut
+       log.SetOutput(cfg.LogVerboseOut)
 
        // FIXME - fix pb about isTerminal=false when out is in VSC Debug Console
 
@@ -116,7 +116,9 @@ func (s *Server) Serve() error {
        // Serve in the background
        serveError := make(chan error, 1)
        go func() {
-               fmt.Printf("Web Server running on localhost:%s ...\n", s.cfg.FileConf.HTTPPort)
+               msg := fmt.Sprintf("Web Server running on localhost:%s ...\n", s.cfg.FileConf.HTTPPort)
+               s.log.Infof(msg)
+               fmt.Printf(msg)
                serveError <- http.ListenAndServe(":"+s.cfg.FileConf.HTTPPort, s.router)
        }()