Skip to content

Commit 1c097a6

Browse files
authored
feat(caddy): use logger from Caddy context (#1369)
1 parent 233753c commit 1c097a6

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

caddy/caddy.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ type FrankenPHPApp struct {
5858
Workers []workerConfig `json:"workers,omitempty"`
5959

6060
metrics frankenphp.Metrics
61+
logger *zap.Logger
6162
}
6263

6364
// CaddyModule returns the Caddy module information.
@@ -71,15 +72,15 @@ func (f FrankenPHPApp) CaddyModule() caddy.ModuleInfo {
7172
// Provision sets up the module.
7273
func (f *FrankenPHPApp) Provision(ctx caddy.Context) error {
7374
f.metrics = frankenphp.NewPrometheusMetrics(ctx.GetMetricsRegistry())
75+
f.logger = ctx.Logger()
7476

7577
return nil
7678
}
7779

7880
func (f *FrankenPHPApp) Start() error {
7981
repl := caddy.NewReplacer()
80-
logger := caddy.Log()
8182

82-
opts := []frankenphp.Option{frankenphp.WithNumThreads(f.NumThreads), frankenphp.WithLogger(logger), frankenphp.WithMetrics(f.metrics)}
83+
opts := []frankenphp.Option{frankenphp.WithNumThreads(f.NumThreads), frankenphp.WithLogger(f.logger), frankenphp.WithMetrics(f.metrics)}
8384
for _, w := range f.Workers {
8485
opts = append(opts, frankenphp.WithWorkers(repl.ReplaceKnown(w.FileName, ""), w.Num, w.Env, w.Watch))
8586
}
@@ -93,7 +94,7 @@ func (f *FrankenPHPApp) Start() error {
9394
}
9495

9596
func (f *FrankenPHPApp) Stop() error {
96-
caddy.Log().Info("FrankenPHP stopped 🐘")
97+
f.logger.Info("FrankenPHP stopped 🐘")
9798

9899
// attempt a graceful shutdown if caddy is exiting
99100
// note: Exiting() is currently marked as 'experimental'
@@ -233,7 +234,7 @@ func (FrankenPHPModule) CaddyModule() caddy.ModuleInfo {
233234

234235
// Provision sets up the module.
235236
func (f *FrankenPHPModule) Provision(ctx caddy.Context) error {
236-
f.logger = ctx.Logger(f)
237+
f.logger = ctx.Logger()
237238

238239
if f.Root == "" {
239240
if frankenphp.EmbeddedAppPath == "" {

0 commit comments

Comments
 (0)