Merge pull request #1519 from vvelikodny/develop

Refactoring: Move dev & prod runmodes to const

beego.go

@@ -24,8 +24,14 @@ import (
 	"github.com/astaxie/beego/logs"
 )
 
+const (
 	// beego web framework version.
-const VERSION = "1.5.0"
+	VERSION = "1.5.0"
+
+	// beego run modes
+	DEV  = "dev"
+	PROD = "prod"
+)
 
 //hook function to run
 type hookfunc func() error

config.go

@@ -111,7 +111,7 @@ var (
 func init() {
 	BConfig = &BeegoConfig{
 		AppName:             "beego",
-		RunMode:             "dev",
+		RunMode:             DEV,
 		RouterCaseSensitive: true,
 		ServerName:          "beegoServer:" + VERSION,
 		RecoverPanic:        true,

controller.go

@@ -204,7 +204,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
 			c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt
 		}
 
-		if BConfig.RunMode == "dev" {
+		if BConfig.RunMode == DEV {
 			buildFiles := []string{c.TplNames}
 			if c.LayoutSections != nil {
 				for _, sectionTpl := range c.LayoutSections {
@@ -255,7 +255,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
 	if c.TplNames == "" {
 		c.TplNames = strings.ToLower(c.controllerName) + "/" + strings.ToLower(c.actionName) + "." + c.TplExt
 	}
-	if BConfig.RunMode == "dev" {
+	if BConfig.RunMode == DEV {
 		BuildTemplate(BConfig.WebConfig.ViewsPath, c.TplNames)
 	}
 	if _, ok := BeeTemplates[c.TplNames]; !ok {
@@ -319,7 +319,7 @@ func (c *Controller) ServeJSON(encoding ...bool) {
 		hasIndent   = true
 		hasEncoding = false
 	)
-	if BConfig.RunMode == "prod" {
+	if BConfig.RunMode == PROD {
 		hasIndent = false
 	}
 	if len(encoding) > 0 && encoding[0] == true {
@@ -331,7 +331,7 @@ func (c *Controller) ServeJSON(encoding ...bool) {
 // ServeJSONP sends a jsonp response.
 func (c *Controller) ServeJSONP() {
 	hasIndent := true
-	if BConfig.RunMode == "prod" {
+	if BConfig.RunMode == PROD {
 		hasIndent = false
 	}
 	c.Ctx.Output.JSONP(c.Data["jsonp"], hasIndent)
@@ -340,7 +340,7 @@ func (c *Controller) ServeJSONP() {
 // ServeXML sends xml response.
 func (c *Controller) ServeXML() {
 	hasIndent := true
-	if BConfig.RunMode == "prod" {
+	if BConfig.RunMode == PROD {
 		hasIndent = false
 	}
 	c.Ctx.Output.XML(c.Data["xml"], hasIndent)

hooks.go

@@ -70,7 +70,7 @@ func registerSession() error {
 func registerTemplate() error {
 	if BConfig.WebConfig.AutoRender {
 		if err := BuildTemplate(BConfig.WebConfig.ViewsPath); err != nil {
-			if BConfig.RunMode == "dev" {
+			if BConfig.RunMode == DEV {
 				Warn(err)
 			}
 			return err

plugins/cors/cors_test.go

@@ -220,7 +220,7 @@ func Test_Preflight(t *testing.T) {
 func Benchmark_WithoutCORS(b *testing.B) {
 	recorder := httptest.NewRecorder()
 	handler := beego.NewControllerRegister()
-	beego.BConfig.RunMode = "prod"
+	beego.BConfig.RunMode = beego.PROD
 	handler.Any("/foo", func(ctx *context.Context) {
 		ctx.Output.SetStatus(500)
 	})
@@ -234,7 +234,7 @@ func Benchmark_WithoutCORS(b *testing.B) {
 func Benchmark_WithCORS(b *testing.B) {
 	recorder := httptest.NewRecorder()
 	handler := beego.NewControllerRegister()
-	beego.BConfig.RunMode = "prod"
+	beego.BConfig.RunMode = beego.PROD
 	handler.InsertFilter("*", beego.BeforeRouter, Allow(&Options{
 		AllowAllOrigins:  true,
 		AllowCredentials: true,

router.go

@@ -204,7 +204,7 @@ func (p *ControllerRegister) addToRouter(method, pattern string, r *controllerIn
 // Include only when the Runmode is dev will generate router file in the router/auto.go from the controller
 // Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{})
 func (p *ControllerRegister) Include(cList ...ControllerInterface) {
-	if BConfig.RunMode == "dev" {
+	if BConfig.RunMode == DEV {
 		skip := make(map[string]bool, 10)
 		for _, c := range cList {
 			reflectVal := reflect.ValueOf(c)
@@ -609,7 +609,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
 	defer p.pool.Put(context)
 	defer p.recoverPanic(context)
 
-	if BConfig.RunMode == "dev" {
+	if BConfig.RunMode == DEV {
 		context.Output.Header("Server", BConfig.ServerName)
 	}
 
@@ -815,7 +815,7 @@ Admin:
 		}
 	}
 
-	if BConfig.RunMode == "dev" || BConfig.Log.AccessLogs {
+	if BConfig.RunMode == DEV || BConfig.Log.AccessLogs {
 		var devinfo string
 		if findrouter {
 			if routerInfo != nil {
@@ -862,7 +862,7 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) {
 				Critical(fmt.Sprintf("%s:%d", file, line))
 				stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d", file, line))
 			}
-			if BConfig.RunMode == "dev" {
+			if BConfig.RunMode == DEV {
 				showErr(err, context, stack)
 			}
 		}

staticfile.go

@@ -49,7 +49,7 @@ func serverStaticRouter(ctx *context.Context) {
 	}
 
 	if filePath == "" || fileInfo == nil {
-		if BConfig.RunMode == "dev" {
+		if BConfig.RunMode == DEV {
 			Warn("Can't find/open the file:", filePath, err)
 		}
 		http.NotFound(ctx.ResponseWriter, ctx.Request)
@@ -68,7 +68,7 @@ func serverStaticRouter(ctx *context.Context) {
 	}
 	b, n, sch, err := openFile(filePath, fileInfo, acceptEncoding)
 	if err != nil {
-		if BConfig.RunMode == "dev" {
+		if BConfig.RunMode == DEV {
 			Warn("Can't compress the file:", filePath, err)
 		}
 		http.NotFound(ctx.ResponseWriter, ctx.Request)