bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 02:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix info content when listens on port :0 for ghttp.Server (#2191)

Browse Source
This commit is contained in:
John Guo
2022-10-11 19:20:39 +08:00
committed by GitHub
parent b96b5c3f7c
commit b617d399b6
1 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
net/ghttp/ghttp_server.go
View File

@ -73,10 +73,10 @@ func serverProcessInit() {
// Process message handler.
// It enabled only a graceful feature is enabled.
if gracefulEnabled {
intlog.Printf(ctx, "%d: graceful reload feature is enabled", gproc.Pid())
intlog.Printf(ctx, "pid[%d]: graceful reload feature is enabled", gproc.Pid())
go handleProcessMessage()
} else {
intlog.Printf(ctx, "%d: graceful reload feature is disabled", gproc.Pid())
intlog.Printf(ctx, "pid[%d]: graceful reload feature is disabled", gproc.Pid())
}
// It's an ugly calling for better initializing the main package path
@ -129,36 +129,13 @@ func (s *Server) Start() error {
swaggerui.Init()
s.AddStaticPath(s.config.SwaggerPath, swaggerUIPackedPath)
s.BindHookHandler(s.config.SwaggerPath+"/*", HookBeforeServe, s.swaggerUI)
s.Logger().Infof(
ctx,
`swagger ui is serving at address: %s%s/`,
s.getLocalListenedAddress(),
s.config.SwaggerPath,
)
}
// OpenApi specification json producing handler.
if s.config.OpenApiPath != "" {
s.BindHandler(s.config.OpenApiPath, s.openapiSpec)
s.Logger().Infof(
ctx,
`openapi specification is serving at address: %s%s`,
s.getLocalListenedAddress(),
s.config.OpenApiPath,
)
} else {
if s.config.SwaggerPath != "" {
s.Logger().Warning(
ctx,
`openapi specification is disabled but swagger ui is serving, which might make no sense`,
)
} else {
s.Logger().Info(
ctx,
`openapi specification is disabled`,
)
}
}
// Register group routes.
s.handlePreBindItems(ctx)
@ -238,6 +215,37 @@ func (s *Server) Start() error {
s.startServer(nil)
}
// Swagger UI info.
if s.config.SwaggerPath != "" {
s.Logger().Infof(
ctx,
`swagger ui is serving at address: %s%s/`,
s.getLocalListenedAddress(),
s.config.SwaggerPath,
)
}
// OpenApi specification info.
if s.config.OpenApiPath != "" {
s.Logger().Infof(
ctx,
`openapi specification is serving at address: %s%s`,
s.getLocalListenedAddress(),
s.config.OpenApiPath,
)
} else {
if s.config.SwaggerPath != "" {
s.Logger().Warning(
ctx,
`openapi specification is disabled but swagger ui is serving, which might make no sense`,
)
} else {
s.Logger().Info(
ctx,
`openapi specification is disabled`,
)
}
}
// If this is a child process, it then notifies its parent exit.
if gproc.IsChild() {
gtimer.SetTimeout(ctx, time.Duration(s.config.GracefulTimeout)*time.Second, func(ctx context.Context) {