Merge pull request #1478 from fuxiaohei/develop

clean compliated codes, refactor if sections in app.go

admin.go

@@ -81,7 +81,11 @@ func qpsIndex(rw http.ResponseWriter, r *http.Request) {
 func listConf(rw http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	command := r.Form.Get("command")
-	if command != "" {
+	if command == "" {
+		rw.Write([]byte("command not support"))
+		return
+	}
+
 	data := make(map[interface{}]interface{})
 	switch command {
 	case "conf":
@@ -94,17 +98,17 @@ func listConf(rw http.ResponseWriter, r *http.Request) {
 		tmpl.Execute(rw, data)
 
 	case "router":
-			content := make(map[string]interface{})
+		var (
-
+			content = map[string]interface{}{
-			var fields = []string{
+				"Fields": []string{
-				fmt.Sprintf("Router Pattern"),
+					"Router Pattern",
-				fmt.Sprintf("Methods"),
+					"Methods",
-				fmt.Sprintf("Controller"),
+					"Controller",
+				},
 			}
-			content["Fields"] = fields
+			methods     = []string{}
-
+			methodsData = make(map[string]interface{})
-			methods := []string{}
+		)
-			methodsData := make(map[string]interface{})
 		for method, t := range BeeApp.Handlers.routers {
 
 			resultList := new([][]string)
@@ -121,16 +125,16 @@ func listConf(rw http.ResponseWriter, r *http.Request) {
 		data["Title"] = "Routers"
 		execTpl(rw, data, routerAndFilterTpl, defaultScriptsTpl)
 	case "filter":
-			content := make(map[string]interface{})
+		var (
-
+			content = map[string]interface{}{
-			var fields = []string{
+				"Fields": []string{
-				fmt.Sprintf("Router Pattern"),
+					"Router Pattern",
-				fmt.Sprintf("Filter Function"),
+					"Filter Function",
+				},
 			}
-			content["Fields"] = fields
+			filterTypes    = []string{}
-
+			filterTypeData = make(map[string]interface{})
-			filterTypes := []string{}
+		)
-			filterTypeData := make(map[string]interface{})
 
 		if BeeApp.Handlers.enableFilter {
 			var filterType string
@@ -165,8 +169,6 @@ func listConf(rw http.ResponseWriter, r *http.Request) {
 	default:
 		rw.Write([]byte("command not support"))
 	}
-	} else {
-	}
 }
 
 func printTree(resultList *[][]string, t *Tree) {
@@ -180,23 +182,23 @@ func printTree(resultList *[][]string, t *Tree) {
 		if v, ok := l.runObject.(*controllerInfo); ok {
 			if v.routerType == routerTypeBeego {
 				var result = []string{
-					fmt.Sprintf("%s", v.pattern),
+					v.pattern,
 					fmt.Sprintf("%s", v.methods),
 					fmt.Sprintf("%s", v.controllerType),
 				}
 				*resultList = append(*resultList, result)
 			} else if v.routerType == routerTypeRESTFul {
 				var result = []string{
-					fmt.Sprintf("%s", v.pattern),
+					v.pattern,
 					fmt.Sprintf("%s", v.methods),
-					fmt.Sprintf(""),
+					"",
 				}
 				*resultList = append(*resultList, result)
 			} else if v.routerType == routerTypeHandler {
 				var result = []string{
-					fmt.Sprintf("%s", v.pattern),
+					v.pattern,
-					fmt.Sprintf(""),
+					"",
-					fmt.Sprintf(""),
+					"",
 				}
 				*resultList = append(*resultList, result)
 			}
@@ -209,11 +211,15 @@ func printTree(resultList *[][]string, t *Tree) {
 func profIndex(rw http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	command := r.Form.Get("command")
-	format := r.Form.Get("format")
+	if command == "" {
-	data := make(map[interface{}]interface{})
+		return
+	}
 
-	var result bytes.Buffer
+	var (
-	if command != "" {
+		format = r.Form.Get("format")
+		data   = make(map[interface{}]interface{})
+		result bytes.Buffer
+	)
 	toolbox.ProcessInput(command, &result)
 	data["Content"] = result.String()
 
@@ -236,22 +242,18 @@ func profIndex(rw http.ResponseWriter, r *http.Request) {
 	}
 	execTpl(rw, data, profillingTpl, defaultTpl)
 }
-}
 
 // Healthcheck is a http.Handler calling health checking and showing the result.
 // it's in "/healthcheck" pattern in admin module.
 func healthcheck(rw http.ResponseWriter, req *http.Request) {
-	data := make(map[interface{}]interface{})
+	var (
-
+		data       = make(map[interface{}]interface{})
-	var result = []string{}
+		result     = []string{}
-	fields := []string{
+		resultList = new([][]string)
-		fmt.Sprintf("Name"),
+		content    = map[string]interface{}{
-		fmt.Sprintf("Message"),
+			"Fields": []string{"Name", "Message", "Status"},
-		fmt.Sprintf("Status"),
 		}
-	resultList := new([][]string)
+	)
-
-	content := make(map[string]interface{})
 
 	for name, h := range toolbox.AdminCheckList {
 		if err := h.Check(); err != nil {
@@ -271,8 +273,6 @@ func healthcheck(rw http.ResponseWriter, req *http.Request) {
 		}
 		*resultList = append(*resultList, result)
 	}
-
-	content["Fields"] = fields
 	content["Data"] = resultList
 	data["Content"] = content
 	data["Title"] = "Health Check"
@@ -288,10 +288,8 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) {
 	req.ParseForm()
 	taskname := req.Form.Get("taskname")
 	if taskname != "" {
-
 		if t, ok := toolbox.AdminTaskList[taskname]; ok {
-			err := t.Run()
+			if err := t.Run(); err != nil {
-			if err != nil {
 				data["Message"] = []string{"error", fmt.Sprintf("%s", err)}
 			}
 			data["Message"] = []string{"success", fmt.Sprintf("%s run success,Now the Status is <br>%s", taskname, t.GetStatus())}
@@ -305,18 +303,18 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) {
 	resultList := new([][]string)
 	var result = []string{}
 	var fields = []string{
-		fmt.Sprintf("Task Name"),
+		"Task Name",
-		fmt.Sprintf("Task Spec"),
+		"Task Spec",
-		fmt.Sprintf("Task Status"),
+		"Task Status",
-		fmt.Sprintf("Last Time"),
+		"Last Time",
-		fmt.Sprintf(""),
+		"",
 	}
 	for tname, tk := range toolbox.AdminTaskList {
 		result = []string{
-			fmt.Sprintf("%s", tname),
+			tname,
 			fmt.Sprintf("%s", tk.GetSpec()),
 			fmt.Sprintf("%s", tk.GetStatus()),
-			fmt.Sprintf("%s", tk.GetPrev().String()),
+			tk.GetPrev().String(),
 		}
 		*resultList = append(*resultList, result)
 	}

app.go

@@ -61,18 +61,19 @@ func (app *App) Run() {
 	var (
 		err        error
 		l          net.Listener
+		endRunning = make(chan bool, 1)
 	)
-	endRunning := make(chan bool, 1)
 
+	// run cgi server
 	if BConfig.Listen.EnableFcgi {
 		if BConfig.Listen.EnableStdIo {
-			err = fcgi.Serve(nil, app.Handlers) // standard I/O
+			if err = fcgi.Serve(nil, app.Handlers); err == nil { // standard I/O
-			if err == nil {
 				BeeLogger.Info("Use FCGI via standard I/O")
 			} else {
-				BeeLogger.Info("Cannot use FCGI via standard I/O", err)
+				BeeLogger.Critical("Cannot use FCGI via standard I/O", err)
+			}
+			return
 		}
-		} else {
 		if BConfig.Listen.HTTPPort == 0 {
 			// remove the Socket file before start
 			if utils.FileExists(addr) {
@@ -85,15 +86,20 @@ func (app *App) Run() {
 		if err != nil {
 			BeeLogger.Critical("Listen: ", err)
 		}
-			err = fcgi.Serve(l, app.Handlers)
+		if err = fcgi.Serve(l, app.Handlers); err != nil {
+			BeeLogger.Critical("fcgi.Serve: ", err)
 		}
-	} else {
+		return
-		if BConfig.Listen.Graceful {
+	}
-			httpsAddr := BConfig.Listen.HTTPSAddr
+
-			app.Server.Addr = httpsAddr
 	app.Server.Handler = app.Handlers
 	app.Server.ReadTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second
 	app.Server.WriteTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second
+
+	// run graceful mode
+	if BConfig.Listen.Graceful {
+		httpsAddr := BConfig.Listen.HTTPSAddr
+		app.Server.Addr = httpsAddr
 		if BConfig.Listen.HTTPSEnable {
 			go func() {
 				time.Sleep(20 * time.Microsecond)
@@ -104,8 +110,7 @@ func (app *App) Run() {
 				server := grace.NewServer(httpsAddr, app.Handlers)
 				server.Server.ReadTimeout = app.Server.ReadTimeout
 				server.Server.WriteTimeout = app.Server.WriteTimeout
-					err := server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile)
+				if err := server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile); err != nil {
-					if err != nil {
 					BeeLogger.Critical("ListenAndServeTLS: ", err, fmt.Sprintf("%d", os.Getpid()))
 					time.Sleep(100 * time.Microsecond)
 					endRunning <- true
@@ -120,20 +125,19 @@ func (app *App) Run() {
 				if BConfig.Listen.ListenTCP4 {
 					server.Network = "tcp4"
 				}
-					err := server.ListenAndServe()
+				if err := server.ListenAndServe(); err != nil {
-					if err != nil {
 					BeeLogger.Critical("ListenAndServe: ", err, fmt.Sprintf("%d", os.Getpid()))
 					time.Sleep(100 * time.Microsecond)
 					endRunning <- true
 				}
 			}()
 		}
-		} else {
+		<-endRunning
-			app.Server.Addr = addr
+		return
-			app.Server.Handler = app.Handlers
+	}
-			app.Server.ReadTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second
-			app.Server.WriteTimeout = time.Duration(BConfig.Listen.ServerTimeOut) * time.Second
 
+	// run normal mode
+	app.Server.Addr = addr
 	if BConfig.Listen.HTTPSEnable {
 		go func() {
 			time.Sleep(20 * time.Microsecond)
@@ -141,15 +145,13 @@ func (app *App) Run() {
 				app.Server.Addr = fmt.Sprintf("%s:%d", BConfig.Listen.HTTPSAddr, BConfig.Listen.HTTPSPort)
 			}
 			BeeLogger.Info("https server Running on %s", app.Server.Addr)
-					err := app.Server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile)
+			if err := app.Server.ListenAndServeTLS(BConfig.Listen.HTTPSCertFile, BConfig.Listen.HTTPSKeyFile); err != nil {
-					if err != nil {
 				BeeLogger.Critical("ListenAndServeTLS: ", err)
 				time.Sleep(100 * time.Microsecond)
 				endRunning <- true
 			}
 		}()
 	}
-
 	if BConfig.Listen.HTTPEnable {
 		go func() {
 			app.Server.Addr = addr
@@ -162,16 +164,14 @@ func (app *App) Run() {
 					endRunning <- true
 					return
 				}
-						err = app.Server.Serve(ln)
+				if err = app.Server.Serve(ln); err != nil {
-						if err != nil {
 					BeeLogger.Critical("ListenAndServe: ", err)
 					time.Sleep(100 * time.Microsecond)
 					endRunning <- true
 					return
 				}
 			} else {
-						err := app.Server.ListenAndServe()
+				if err := app.Server.ListenAndServe(); err != nil {
-						if err != nil {
 					BeeLogger.Critical("ListenAndServe: ", err)
 					time.Sleep(100 * time.Microsecond)
 					endRunning <- true
@@ -179,9 +179,6 @@ func (app *App) Run() {
 			}
 		}()
 	}
-		}
-
-	}
 	<-endRunning
 }