Merge pull request #4276 from flycash/newHttpServer

Change NewHttpServer API

server/web/admin.go

@@ -109,7 +109,7 @@ func registerAdmin() error {
 			servers: make([]*HttpServer, 0, 2),
 		}
 		beeAdminApp = &adminApp{
-			HttpServer: NewHttpServerWithCfg(*BConfig),
+			HttpServer: NewHttpServerWithCfg(BConfig),
 		}
 		// keep in mind that all data should be html escaped to avoid XSS attack
 		beeAdminApp.Router("/", c, "get:AdminIndex")

server/web/server.go

@@ -59,19 +59,18 @@ type HttpServer struct {
 
 // NewHttpSever returns a new beego application.
 // this method will use the BConfig as the configure to create HttpServer
-// Be careful that when you update BConfig, the server's Cfg will not be updated
+// Be careful that when you update BConfig, the server's Cfg will be updated too
 func NewHttpSever() *HttpServer {
-	return NewHttpServerWithCfg(*BConfig)
+	return NewHttpServerWithCfg(BConfig)
 }
 
 // NewHttpServerWithCfg will create an sever with specific cfg
-func NewHttpServerWithCfg(cfg Config) *HttpServer {
+func NewHttpServerWithCfg(cfg *Config) *HttpServer {
-	cfgPtr := &cfg
+	cr := NewControllerRegisterWithCfg(cfg)
-	cr := NewControllerRegisterWithCfg(cfgPtr)
 	app := &HttpServer{
 		Handlers: cr,
 		Server:   &http.Server{},
-		Cfg:      cfgPtr,
+		Cfg:      cfg,
 	}
 
 	return app

server/web/server_test.go

@@ -21,11 +21,10 @@ import (
 )
 
 func TestNewHttpServerWithCfg(t *testing.T) {
-	// we should make sure that update server's config won't change
+
 	BConfig.AppName = "Before"
-	svr := NewHttpServerWithCfg(*BConfig)
+	svr := NewHttpServerWithCfg(BConfig)
 	svr.Cfg.AppName = "hello"
-	assert.NotEqual(t, "hello", BConfig.AppName)
+	assert.Equal(t, "hello", BConfig.AppName)
-	assert.Equal(t, "Before", BConfig.AppName)
 
 }