X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=lib%2Fwebserver%2Fserver.go;h=a2fdf6f8fe935f8d42a7b4dbbbd6dec1adca96bf;hb=d4f7b45c3fe483d3864534642f10cf8f6ee23ae9;hp=7be157a3cb23b6241c7c3e273240cb01563d23ee;hpb=c07adb807c41a1545a9a0f5bbf40080d86946538;p=src%2Fxds%2Fxds-server.git diff --git a/lib/webserver/server.go b/lib/webserver/server.go index 7be157a..a2fdf6f 100644 --- a/lib/webserver/server.go +++ b/lib/webserver/server.go @@ -1,6 +1,8 @@ package webserver import ( + "fmt" + "log" "net/http" "os" @@ -11,20 +13,22 @@ import ( "github.com/gin-gonic/gin" "github.com/googollee/go-socket.io" "github.com/iotbzh/xds-server/lib/apiv1" + "github.com/iotbzh/xds-server/lib/crosssdk" "github.com/iotbzh/xds-server/lib/model" "github.com/iotbzh/xds-server/lib/session" "github.com/iotbzh/xds-server/lib/xdsconfig" ) -// ServerService . -type ServerService struct { +// Server . +type Server struct { router *gin.Engine api *apiv1.APIService sIOServer *socketio.Server 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 } @@ -32,34 +36,36 @@ type ServerService struct { const indexFilename = "index.html" const cookieMaxAge = "3600" -// NewServer creates an instance of ServerService -func NewServer(cfg *xdsconfig.Config, mfolder *model.Folder, log *logrus.Logger) *ServerService { +// New creates an instance of Server +func New(cfg *xdsconfig.Config, mfolders *model.Folders, sdks *crosssdk.SDKs, logr *logrus.Logger) *Server { // Setup logging for gin router - if cfg.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() - svr := &ServerService{ + svr := &Server{ router: r, api: nil, sIOServer: nil, webApp: nil, cfg: cfg, - log: log, sessions: nil, - mfolder: mfolder, + mfolders: mfolders, + sdks: sdks, + log: logr, stop: make(chan struct{}), } @@ -67,7 +73,7 @@ func NewServer(cfg *xdsconfig.Config, mfolder *model.Folder, log *logrus.Logger) } // Serve starts a new instance of the Web Server -func (s *ServerService) Serve() error { +func (s *Server) Serve() error { var err error // Setup middlewares @@ -80,7 +86,7 @@ func (s *ServerService) Serve() error { s.sessions = session.NewClientSessions(s.router, s.log, cookieMaxAge) // Create REST API - s.api = apiv1.New(s.sessions, s.cfg, s.mfolder, s.router) + s.api = apiv1.New(s.router, s.sessions, s.cfg, s.mfolders, s.sdks) // Websocket routes s.sIOServer, err = socketio.NewServer(nil) @@ -96,12 +102,12 @@ func (s *ServerService) 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("/") @@ -110,7 +116,10 @@ func (s *ServerService) Serve() error { // Serve in the background serveError := make(chan error, 1) go func() { - 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 @@ -128,17 +137,17 @@ func (s *ServerService) Serve() error { } // Stop web server -func (s *ServerService) Stop() { +func (s *Server) Stop() { close(s.stop) } // serveIndexFile provides initial file (eg. index.html) of webapp -func (s *ServerService) serveIndexFile(c *gin.Context) { +func (s *Server) serveIndexFile(c *gin.Context) { c.HTML(200, indexFilename, gin.H{}) } // Add details in Header -func (s *ServerService) middlewareXDSDetails() gin.HandlerFunc { +func (s *Server) middlewareXDSDetails() gin.HandlerFunc { return func(c *gin.Context) { c.Header("XDS-Version", s.cfg.Version) c.Header("XDS-API-Version", s.cfg.APIVersion) @@ -147,14 +156,12 @@ func (s *ServerService) middlewareXDSDetails() gin.HandlerFunc { } // CORS middleware -func (s *ServerService) middlewareCORS() gin.HandlerFunc { +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 @@ -165,7 +172,7 @@ func (s *ServerService) middlewareCORS() gin.HandlerFunc { } // socketHandler is the handler for the "main" websocket connection -func (s *ServerService) socketHandler(c *gin.Context) { +func (s *Server) socketHandler(c *gin.Context) { // Retrieve user session sess := s.sessions.Get(c)