refactor🎨: 移除服务管理

This commit is contained in:
zhangwenjian committed 2021-06-30 01:52:47 +08:00
1 parent e2cb033670
commit 862f24d8a7
1 file changed
+36 -35
+36 -35
View File
@@ -4,7 +4,9 @@ import (
"context" "context"
"fmt" "fmt"
"log" "log"
"net/http"
"os" "os"
"os/signal"
"time" "time"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@@ -14,8 +16,6 @@ import (
"github.com/go-admin-team/go-admin-core/sdk/config" "github.com/go-admin-team/go-admin-core/sdk/config"
"github.com/go-admin-team/go-admin-core/sdk/pkg" "github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/runtime" "github.com/go-admin-team/go-admin-core/sdk/runtime"
"github.com/go-admin-team/go-admin-core/server"
"github.com/go-admin-team/go-admin-core/server/listener"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"go-admin/app/admin/models" "go-admin/app/admin/models"
@@ -86,6 +86,11 @@ func run() error {
f() f()
} }
srv := &http.Server{
Addr: fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port),
Handler: sdk.Runtime.GetEngine(),
}
go func() { go func() {
jobs.InitJob() jobs.InitJob()
jobs.Setup(sdk.Runtime.GetDb()) jobs.Setup(sdk.Runtime.GetDb())
@@ -111,26 +116,39 @@ func run() error {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel() defer cancel()
if !config.SslConfig.Enable { go func() {
config.SslConfig.Pem, config.SslConfig.KeyStr = "", "" // 服务连接
} if config.SslConfig.Enable {
s := listener.New("go-admin", if err := srv.ListenAndServeTLS(config.SslConfig.Pem, config.SslConfig.KeyStr); err != nil && err != http.ErrServerClosed {
listener.WithAddr(fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port)), log.Fatal("listen: ", err)
listener.WithHandler(sdk.Runtime.GetEngine()), }
listener.WithStartedHook(startedHook), } else {
listener.WithEndHook(endHook), if err := srv.ListenAndServe(); err != nil && err != http.ErrServerClosed {
) log.Fatal("listen: ", err)
m := listener.NewMetrics() }
h := listener.NewHealthz() }
}()
fmt.Println(pkg.Red(string(global.LogoContent)))
tip()
fmt.Println(pkg.Green("Server run at:"))
fmt.Printf("- Local: http://localhost:%d/ \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/ \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Println(pkg.Green("Swagger run at:"))
fmt.Printf("- Local: http://localhost:%d/swagger/index.html \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/swagger/index.html \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Printf("%s Enter Control + C Shutdown Server \r\n", pkg.GetCurrentTimeStr())
// 等待中断信号以优雅地关闭服务器(设置 5 秒的超时时间)
quit := make(chan os.Signal)
signal.Notify(quit, os.Interrupt)
<-quit
fmt.Printf("%s Shutdown Server ... \r\n", pkg.GetCurrentTimeStr())
mgr := server.New() if err := srv.Shutdown(ctx); err != nil {
mgr.Add(m, h, s) log.Fatal("Server Shutdown:", err)
if err := mgr.Start(ctx); err != nil {
log.Fatal("listen: ", err)
} }
log.Println("Server exiting") log.Println("Server exiting")
return nil
return nil
} }
var Router runtime.Router var Router runtime.Router
@@ -165,20 +183,3 @@ func initRouter() {
common.InitMiddleware(r) common.InitMiddleware(r)
} }
func startedHook() {
time.Sleep(time.Millisecond)
fmt.Println(pkg.Red(string(global.LogoContent)))
tip()
fmt.Println(pkg.Green("Server run at:"))
fmt.Printf("- Local: http://localhost:%d/ \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/ \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Println(pkg.Green("Swagger run at:"))
fmt.Printf("- Local: http://localhost:%d/swagger/index.html \r\n", config.ApplicationConfig.Port)
fmt.Printf("- Network: http://%s:%d/swagger/index.html \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
fmt.Printf("%s Enter Control + C Shutdown Server \r\n", pkg.GetCurrentTimeStr())
}
func endHook() {
fmt.Printf("%s Shutdown Server ... \r\n", pkg.GetCurrentTimeStr())
}