Explorar o código

移除旧的命令文件并更新服务器日志信息

移除了`src/cmd/v1/main.go`和`src/cmd/define/mainfuc.go`文件,并在`src/cmd/version1/main.go`中添加了新的主函数。同时,更新了`src/server/server.go`中的日志信息以区分HTTP和HTTPS服务器启动。
SongZihuan hai 3 meses
pai
achega
4f6b683271
Modificáronse 5 ficheiros con 12 adicións e 24 borrados
  1. 0 3
      src/cmd/define/mainfuc.go
  2. 0 17
      src/cmd/v1/main.go
  3. 10 0
      src/cmd/version1/main.go
  4. 0 2
      src/mainfunc/v1.go
  5. 2 2
      src/server/server.go

+ 0 - 3
src/cmd/define/mainfuc.go

@@ -1,3 +0,0 @@
-package define
-
-type MainFunc func() int

+ 0 - 17
src/cmd/v1/main.go

@@ -1,17 +0,0 @@
-package main
-
-import (
-	"github.com/SongZihuan/huan-proxy/src/cmd/define"
-	"github.com/SongZihuan/huan-proxy/src/mainfunc"
-	"github.com/SongZihuan/huan-proxy/src/utils"
-)
-
-var v1Main define.MainFunc = mainfunc.MainV1
-
-func main() {
-	utils.Exit(_main())
-}
-
-func _main() int {
-	return v1Main()
-}

+ 10 - 0
src/cmd/version1/main.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"github.com/SongZihuan/huan-proxy/src/mainfunc"
+	"github.com/SongZihuan/huan-proxy/src/utils"
+)
+
+func main() {
+	utils.Exit(mainfunc.MainV1())
+}

+ 0 - 2
src/mainfunc/v1.go

@@ -94,6 +94,4 @@ func MainV1() int {
 			return 0
 		}
 	}
-
-	return 0
 }

+ 2 - 2
src/server/server.go

@@ -175,7 +175,7 @@ func (s *HTTPSServer) runHttps(_httpschan chan error) chan error {
 		}()
 	ListenCycle:
 		for {
-			logger.Infof("start server in %s", s.cfg.Address)
+			logger.Infof("start https server in %s", s.cfg.Address)
 			err := s.server.ListenAndServeTLS("", "")
 			if err != nil && errors.Is(err, http.ErrServerClosed) {
 				if s.reloadMutex.TryLock() {
@@ -251,7 +251,7 @@ func (s *HTTPServer) loadHttp() error {
 
 func (s *HTTPServer) runHttp(_httpschan chan error) chan error {
 	go func(httpschan chan error) {
-		logger.Infof("start server in %s", s.cfg.Address)
+		logger.Infof("start http server in %s", s.cfg.Address)
 		err := s.server.ListenAndServe()
 		if err != nil && errors.Is(err, http.ErrServerClosed) {
 			httpschan <- ServerStop