optimize and test

Author: 郑树新

examples/gin-server/gin-server.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
 	"net"
 	"sync"
@@ -44,6 +45,8 @@ func parseArgs()  {
 }
 
 func main()  {
+	fmt.Println("Current master-go version:", master.Version)
+
 	// parse args from commandline or acl_master's exec
 	parseArgs()
 

examples/go-echod/main.go

@@ -35,6 +35,8 @@ var (
 )
 
 func main() {
+	fmt.Println("Current master-go version:", master.Version)
+
 	flag.StringVar(&listenAddrs, "listen", "127.0.0.1:28880, 127.0.0.1:28881",
 		"listen addr in alone running")
 

examples/go-httpd/main.go

@@ -25,6 +25,8 @@ var (
 )
 
 func main() {
+	fmt.Println("Current master-go version:", master.Version)
+
 	flag.Parse()
 
 	master.Prepare()

examples/httpd-handler/main.go

@@ -43,6 +43,8 @@ func (handler MyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 }
 
 func main() {
+	fmt.Println("Current master-go version:", master.Version)
+
 	flag.StringVar(&filePath, "c", "dummy.cf", "configure filePath")
 	flag.StringVar(&listenAddrs, "listen", "127.0.0.1:8088", "listen addr in alone running")
 	flag.Parse()

service.go

@@ -76,9 +76,12 @@ var (
 	MasterUnprivileged bool
 	//	MasterChroot       bool
 	MasterSocketCount int = 1
+
 	Alone             bool
 )
 
+const Version string = "1.0.3"
+
 // setOpenMax set the max opened file handles for current process which let
 // the process can handle more connections.
 func setOpenMax() {
@@ -262,7 +265,7 @@ func chroot() {
 func GetListenersByAddrs(addrs string) ([]net.Listener, error) {
 	if len(addrs) == 0 {
 		log.Println("No valid addrs for listening")
-		return nil, errors.New("No valid addrs for listening")
+		return nil, errors.New("no valid addrs for listening")
 	}
 
 	// split addrs like "xxx.xxx.xxx.xxx:port; xxx.xxx.xxx.xxx:port"
@@ -283,7 +286,7 @@ func GetListenersByAddrs(addrs string) ([]net.Listener, error) {
 		log.Println("Listen", addr, "error:", err)
 	}
 	if len(listeners) == 0 {
-		return nil, errors.New("No listeners were created!")
+		return nil, errors.New("no listeners were created!")
 	}
 	return listeners, nil
 }
@@ -293,7 +296,7 @@ func GetListenersByAddrs(addrs string) ([]net.Listener, error) {
 func GetListeners() ([]net.Listener, error) {
 	listeners := []net.Listener(nil)
 	for fd := listenFdStart; fd < listenFdStart+listenFdCount; fd++ {
-		file := os.NewFile(uintptr(fd), "open one listenfd")
+		file := os.NewFile(uintptr(fd), "open one listen fd")
 		if file == nil {
 			log.Printf("os.NewFile failed for fd=%d", fd)
 			continue
@@ -315,7 +318,7 @@ func GetListeners() ([]net.Listener, error) {
 
 	if len(listeners) == 0 {
 		log.Println("No listener created!")
-		return nil, errors.New("No listener created")
+		return nil, errors.New("no listener created")
 	} else {
 		log.Printf("Listeners's len=%d\r\n", len(listeners))
 	}
@@ -359,7 +362,7 @@ func ServiceInit(addrs string, stopHandler func(bool)) ([]net.Listener, error) {
 
 	if len(listeners) == 0 {
 		log.Println("No listener available!")
-		return nil, errors.New("No listener available")
+		return nil, errors.New("no listener available")
 	}
 
 	// In daemon mode, the backend monitor fiber will be created for

service_windows.go

@@ -43,12 +43,13 @@ var (
 	doneChan       chan bool   = make(chan bool)
 	connCount      int         = 0
 	connMutex      sync.RWMutex
-	stopping       bool = false
-	prepareCalled  bool = false
+	stopping       = false
+	prepareCalled  = false
 )
 
 // from configure file of the app
 var (
+	AppConf       *Config
 	MasterService  string
 	MasterLogPath  string
 	MasterOwner    string
@@ -60,6 +61,9 @@ var (
 	AppWaitLimit   int    = 10
 	AppAccessAllow string = "all"
 	Appthreads     int    = 0
+
+	TlsCertFile    string
+	TlsKeyFile     string
 )
 
 // from command args
@@ -149,10 +153,10 @@ func Prepare() {
 
 	parseArgs()
 
-	conf := new(Config)
-	conf.InitConfig(confPath)
+	AppConf = new(Config)
+	AppConf.InitConfig(confPath)
 
-	MasterLogPath = conf.GetString("master_log")
+	MasterLogPath = AppConf.GetString("master_log")
 	if len(MasterLogPath) > 0 {
 		f, err := os.OpenFile(MasterLogPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
 		if err != nil {
@@ -163,21 +167,24 @@ func Prepare() {
 		}
 	}
 
-	MasterService = conf.GetString("master_service")
-	MasterOwner = conf.GetString("master_owner")
-	MasterArgs = conf.GetString("master_args")
-
-	AppRootDir = conf.GetString("app_queue_dir")
-	AppUseLimit = conf.GetInt("app_use_limit")
-	AppIdleLimit = conf.GetInt("app_idle_limit")
-	AppQuickAbort = conf.GetBool("app_quick_abort")
-	AppWaitLimit = conf.GetInt("app_wait_limit")
-	AppAccessAllow = conf.GetString("app_access_allow")
-	Appthreads = conf.GetInt("app_threads")
+	MasterService = AppConf.GetString("master_service")
+	MasterOwner = AppConf.GetString("master_owner")
+	MasterArgs = AppConf.GetString("master_args")
+
+	AppRootDir = AppConf.GetString("app_queue_dir")
+	AppUseLimit = AppConf.GetInt("app_use_limit")
+	AppIdleLimit = AppConf.GetInt("app_idle_limit")
+	AppQuickAbort = AppConf.GetBool("app_quick_abort")
+	AppWaitLimit = AppConf.GetInt("app_wait_limit")
+	AppAccessAllow = AppConf.GetString("app_access_allow")
+	Appthreads = AppConf.GetInt("app_threads")
 	if Appthreads > 0 {
 		runtime.GOMAXPROCS(Appthreads)
 	}
 
+	TlsCertFile = AppConf.GetString("tls_cert_file")
+	TlsKeyFile = AppConf.GetString("tls_key_file")
+
 	log.Printf("Args: %s, AppAccessAllow: %s\r\n", MasterArgs, AppAccessAllow)
 }
 
@@ -196,8 +203,8 @@ func chroot() {
 // and call this function to listen the given addrs
 func GetListenersByAddrs(addrs string) ([]net.Listener, error) {
 	if len(addrs) == 0 {
-		log.Println("No valid addrs for listening")
-		return nil, errors.New("No valid addrs for listening")
+		log.Println("no valid addresses for listening")
+		return nil, errors.New("no valid addresses for listening")
 	}
 
 	// split addrs like "xxx.xxx.xxx.xxx:port; xxx.xxx.xxx.xxx:port"
@@ -218,8 +225,8 @@ func GetListenersByAddrs(addrs string) ([]net.Listener, error) {
 		log.Println("Listen", addr, "error:", err)
 	}
 	if len(listeners) == 0 {
-		log.Println("No listeners were createdd")
-		return nil, errors.New("No listeners were created")
+		log.Println("no listeners were created")
+		return nil, errors.New("no listeners were created")
 	}
 	return listeners, nil
 }
@@ -229,7 +236,7 @@ func GetListenersByAddrs(addrs string) ([]net.Listener, error) {
 func GetListeners() ([]net.Listener, error) {
 	listeners := []net.Listener(nil)
 	for fd := listenFdStart; fd < listenFdStart+listenFdCount; fd++ {
-		file := os.NewFile(uintptr(fd), "open one listenfd")
+		file := os.NewFile(uintptr(fd), "open one listen fd")
 		if file == nil {
 			log.Printf("os.NewFile failed for fd=%d", fd)
 			continue
@@ -251,7 +258,7 @@ func GetListeners() ([]net.Listener, error) {
 
 	if len(listeners) == 0 {
 		log.Println("No listener created!")
-		return nil, errors.New("No listener created")
+		return nil, errors.New("no listener created")
 	} else {
 		log.Printf("Listeners's len=%d", len(listeners))
 	}
@@ -271,7 +278,7 @@ func ServiceInit(addrs string, stopHandler func(bool)) ([]net.Listener, error) {
 		initHandler()
 	}
 
-	// if addrs not empty, alone mode will be used, or daemon mode be used
+	// if addresses not empty, alone mode will be used, or daemon mode be used
 
 	var listeners []net.Listener
 	var daemonMode bool
@@ -295,7 +302,7 @@ func ServiceInit(addrs string, stopHandler func(bool)) ([]net.Listener, error) {
 
 	if len(listeners) == 0 {
 		log.Println("No listener available!")
-		return nil, errors.New("No listener available")
+		return nil, errors.New("no listener available")
 	}
 
 	// In daemon mode, the backend monitor fiber will be created for

web_service.go

@@ -48,7 +48,7 @@ func WebDaemonStart(handler http.Handler) error{
 	return WebStart("", handler)
 }
 
-// start WEB service with the specified listening addrs
+// WebStart start WEB service with the specified listening addrs
 func WebStart(addrs string, handler http.Handler) error {
 	var listeners []net.Listener
 	listeners, err := ServiceInit(addrs, webStop)