Puqns67/serenity
1
0
Fork 0
forked from mirror/serenity
Code Issues Pull Requests Packages Activity

Fix the panic caused by not starting LogFactory

Browse Source
This commit is contained in:
Patrick Lamar 2024-03-26 19:05:55 +08:00 committed by 世界
parent 06cea13da6
commit a6d1a21560
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/server.go
View File

@ -44,6 +44,7 @@ func New(ctx context.Context, options option.Options) (*Server, error) {
ctx = service.ContextWithDefaultRegistry(ctx) ctx = service.ContextWithDefaultRegistry(ctx)
createdAt := time.Now() createdAt := time.Now()
logFactory, err := log.New(log.Options{ logFactory, err := log.New(log.Options{
Context: ctx,
Options: common.PtrValueOrDefault(options.Log), Options: common.PtrValueOrDefault(options.Log),
DefaultWriter: os.Stderr, DefaultWriter: os.Stderr,
BaseTime: createdAt, BaseTime: createdAt,
@ -51,6 +52,7 @@ func New(ctx context.Context, options option.Options) (*Server, error) {
if err != nil { if err != nil {
return nil, E.Cause(err, "create log factory") return nil, E.Cause(err, "create log factory")
} }
chiRouter := chi.NewRouter() chiRouter := chi.NewRouter()
httpServer := &http.Server{ httpServer := &http.Server{
Addr: options.Listen, Addr: options.Listen,
@ -128,7 +130,11 @@ func New(ctx context.Context, options option.Options) (*Server, error) {
func (s *Server) Start() error { func (s *Server) Start() error {
s.initializeRoutes() s.initializeRoutes()
err := s.cacheFile.Start() err := s.logFactory.Start()
if err != nil {
return err
}
err = s.cacheFile.Start()
if err != nil { if err != nil {
return err return err
} }