X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fwebserver%2Fserver.go;h=a2fdf6f8fe935f8d42a7b4dbbbd6dec1adca96bf;hb=5756bd350d585660cce53a28dc66bfcf162ecca1;hp=774195cfb7c26f29ad729827a9476634212adf2d;hpb=a52a4ddc7662b8a4d0b8a1fd7be88742d1379691;p=src%2Fxds%2Fxds-server.git

diff --git a/lib/webserver/server.go b/lib/webserver/server.go
index 774195c..a2fdf6f 100644
--- a/lib/webserver/server.go
+++ b/lib/webserver/server.go
@@ -2,6 +2,7 @@ package webserver
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 
@@ -26,7 +27,7 @@ type Server struct {
 	webApp    *gin.RouterGroup
 	cfg       *xdsconfig.Config
 	sessions  *session.Sessions
-	mfolder   *model.Folder
+	mfolders  *model.Folders
 	sdks      *crosssdk.SDKs
 	log       *logrus.Logger
 	stop      chan struct{} // signals intentional stop
@@ -36,20 +37,21 @@ const indexFilename = "index.html"
 const cookieMaxAge = "3600"
 
 // New creates an instance of Server
-func New(cfg *xdsconfig.Config, mfolder *model.Folder, sdks *crosssdk.SDKs, log *logrus.Logger) *Server {
+func New(cfg *xdsconfig.Config, mfolders *model.Folders, sdks *crosssdk.SDKs, logr *logrus.Logger) *Server {
 
 	// Setup logging for gin router
-	if log.Level == logrus.DebugLevel {
+	if logr.Level == logrus.DebugLevel {
 		gin.SetMode(gin.DebugMode)
 	} else {
 		gin.SetMode(gin.ReleaseMode)
 	}
 
-	// TODO
-	//  - try to bind gin DefaultWriter & DefaultErrorWriter to logrus logger
-	//  - try to fix pb about isTerminal=false when out is in VSC Debug Console
-	//gin.DefaultWriter = ??
-	//gin.DefaultErrorWriter = ??
+	// 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
 
 	// Creates gin router
 	r := gin.New()
@@ -61,9 +63,9 @@ func New(cfg *xdsconfig.Config, mfolder *model.Folder, sdks *crosssdk.SDKs, log
 		webApp:    nil,
 		cfg:       cfg,
 		sessions:  nil,
-		mfolder:   mfolder,
+		mfolders:  mfolders,
 		sdks:      sdks,
-		log:       log,
+		log:       logr,
 		stop:      make(chan struct{}),
 	}
 
@@ -84,7 +86,7 @@ func (s *Server) Serve() error {
 	s.sessions = session.NewClientSessions(s.router, s.log, cookieMaxAge)
 
 	// Create REST API
-	s.api = apiv1.New(s.router, s.sessions, s.cfg, s.mfolder, s.sdks)
+	s.api = apiv1.New(s.router, s.sessions, s.cfg, s.mfolders, s.sdks)
 
 	// Websocket routes
 	s.sIOServer, err = socketio.NewServer(nil)
@@ -100,12 +102,12 @@ func (s *Server) Serve() error {
 	*/
 
 	// Web Application (serve on / )
-	idxFile := path.Join(s.cfg.WebAppDir, indexFilename)
+	idxFile := path.Join(s.cfg.FileConf.WebAppDir, indexFilename)
 	if _, err := os.Stat(idxFile); err != nil {
 		s.log.Fatalln("Web app directory not found, check/use webAppDir setting in config file: ", idxFile)
 	}
-	s.log.Infof("Serve WEB app dir: %s", s.cfg.WebAppDir)
-	s.router.Use(static.Serve("/", static.LocalFile(s.cfg.WebAppDir, true)))
+	s.log.Infof("Serve WEB app dir: %s", s.cfg.FileConf.WebAppDir)
+	s.router.Use(static.Serve("/", static.LocalFile(s.cfg.FileConf.WebAppDir, true)))
 	s.webApp = s.router.Group("/", s.serveIndexFile)
 	{
 		s.webApp.GET("/")
@@ -114,8 +116,10 @@ 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.HTTPPort)
-		serveError <- http.ListenAndServe(":"+s.cfg.HTTPPort, s.router)
+		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)
 	}()
 
 	// Wait for stop, restart or error signals
@@ -154,12 +158,10 @@ func (s *Server) middlewareXDSDetails() gin.HandlerFunc {
 // CORS middleware
 func (s *Server) middlewareCORS() gin.HandlerFunc {
 	return func(c *gin.Context) {
-
 		if c.Request.Method == "OPTIONS" {
 			c.Header("Access-Control-Allow-Origin", "*")
 			c.Header("Access-Control-Allow-Headers", "Content-Type")
-			c.Header("Access-Control-Allow-Methods", "POST, DELETE, GET, PUT")
-			c.Header("Content-Type", "application/json")
+			c.Header("Access-Control-Allow-Methods", "GET, POST, DELETE")
 			c.Header("Access-Control-Max-Age", cookieMaxAge)
 			c.AbortWithStatus(204)
 			return