Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added prints on startup
[src/xds/xds-server.git]
/
lib
/
webserver
/
server.go
diff --git
a/lib/webserver/server.go
b/lib/webserver/server.go
index
7be157a
..
774195c
100644
(file)
--- a/
lib/webserver/server.go
+++ b/
lib/webserver/server.go
@@
-1,6
+1,7
@@
package webserver
import (
package webserver
import (
+ "fmt"
"net/http"
"os"
"net/http"
"os"
@@
-11,13
+12,14
@@
import (
"github.com/gin-gonic/gin"
"github.com/googollee/go-socket.io"
"github.com/iotbzh/xds-server/lib/apiv1"
"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"
)
"github.com/iotbzh/xds-server/lib/model"
"github.com/iotbzh/xds-server/lib/session"
"github.com/iotbzh/xds-server/lib/xdsconfig"
)
-// Server
Service
.
-type Server
Service
struct {
+// Server .
+type Server struct {
router *gin.Engine
api *apiv1.APIService
sIOServer *socketio.Server
router *gin.Engine
api *apiv1.APIService
sIOServer *socketio.Server
@@
-25,6
+27,7
@@
type ServerService struct {
cfg *xdsconfig.Config
sessions *session.Sessions
mfolder *model.Folder
cfg *xdsconfig.Config
sessions *session.Sessions
mfolder *model.Folder
+ sdks *crosssdk.SDKs
log *logrus.Logger
stop chan struct{} // signals intentional stop
}
log *logrus.Logger
stop chan struct{} // signals intentional stop
}
@@
-32,11
+35,11
@@
type ServerService struct {
const indexFilename = "index.html"
const cookieMaxAge = "3600"
const indexFilename = "index.html"
const cookieMaxAge = "3600"
-// New
Server creates an instance of ServerService
-func New
Server(cfg *xdsconfig.Config, mfolder *model.Folder, log *logrus.Logger) *ServerService
{
+// New
creates an instance of Server
+func New
(cfg *xdsconfig.Config, mfolder *model.Folder, sdks *crosssdk.SDKs, log *logrus.Logger) *Server
{
// Setup logging for gin router
// Setup logging for gin router
- if
cfg.L
og.Level == logrus.DebugLevel {
+ if
l
og.Level == logrus.DebugLevel {
gin.SetMode(gin.DebugMode)
} else {
gin.SetMode(gin.ReleaseMode)
gin.SetMode(gin.DebugMode)
} else {
gin.SetMode(gin.ReleaseMode)
@@
-51,15
+54,16
@@
func NewServer(cfg *xdsconfig.Config, mfolder *model.Folder, log *logrus.Logger)
// Creates gin router
r := gin.New()
// Creates gin router
r := gin.New()
- svr := &Server
Service
{
+ svr := &Server{
router: r,
api: nil,
sIOServer: nil,
webApp: nil,
cfg: cfg,
router: r,
api: nil,
sIOServer: nil,
webApp: nil,
cfg: cfg,
- log: log,
sessions: nil,
mfolder: mfolder,
sessions: nil,
mfolder: mfolder,
+ sdks: sdks,
+ log: log,
stop: make(chan struct{}),
}
stop: make(chan struct{}),
}
@@
-67,7
+71,7
@@
func NewServer(cfg *xdsconfig.Config, mfolder *model.Folder, log *logrus.Logger)
}
// Serve starts a new instance of the Web Server
}
// Serve starts a new instance of the Web Server
-func (s *Server
Service
) Serve() error {
+func (s *Server) Serve() error {
var err error
// Setup middlewares
var err error
// Setup middlewares
@@
-80,7
+84,7
@@
func (s *ServerService) Serve() error {
s.sessions = session.NewClientSessions(s.router, s.log, cookieMaxAge)
// Create REST API
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.mfolder, s.sdks
)
// Websocket routes
s.sIOServer, err = socketio.NewServer(nil)
// Websocket routes
s.sIOServer, err = socketio.NewServer(nil)
@@
-110,6
+114,7
@@
func (s *ServerService) Serve() error {
// Serve in the background
serveError := make(chan error, 1)
go func() {
// 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)
}()
serveError <- http.ListenAndServe(":"+s.cfg.HTTPPort, s.router)
}()
@@
-128,17
+133,17
@@
func (s *ServerService) Serve() error {
}
// Stop web server
}
// Stop web server
-func (s *Server
Service
) Stop() {
+func (s *Server) Stop() {
close(s.stop)
}
// serveIndexFile provides initial file (eg. index.html) of webapp
close(s.stop)
}
// serveIndexFile provides initial file (eg. index.html) of webapp
-func (s *Server
Service
) serveIndexFile(c *gin.Context) {
+func (s *Server) serveIndexFile(c *gin.Context) {
c.HTML(200, indexFilename, gin.H{})
}
// Add details in Header
c.HTML(200, indexFilename, gin.H{})
}
// Add details in Header
-func (s *Server
Service
) 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)
return func(c *gin.Context) {
c.Header("XDS-Version", s.cfg.Version)
c.Header("XDS-API-Version", s.cfg.APIVersion)
@@
-147,7
+152,7
@@
func (s *ServerService) middlewareXDSDetails() gin.HandlerFunc {
}
// CORS middleware
}
// CORS middleware
-func (s *Server
Service
) middlewareCORS() gin.HandlerFunc {
+func (s *Server) middlewareCORS() gin.HandlerFunc {
return func(c *gin.Context) {
if c.Request.Method == "OPTIONS" {
return func(c *gin.Context) {
if c.Request.Method == "OPTIONS" {
@@
-165,7
+170,7
@@
func (s *ServerService) middlewareCORS() gin.HandlerFunc {
}
// socketHandler is the handler for the "main" websocket connection
}
// socketHandler is the handler for the "main" websocket connection
-func (s *Server
Service
) socketHandler(c *gin.Context) {
+func (s *Server) socketHandler(c *gin.Context) {
// Retrieve user session
sess := s.sessions.Get(c)
// Retrieve user session
sess := s.sessions.Get(c)