fix: correctly set the Mercure hub for the main worker request#2026
Merged
fix: correctly set the Mercure hub for the main worker request#2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes an issue where the Mercure hub was not correctly set for worker initialization requests. The solution refactors how request options (like Mercure hub and logger) are propagated from Caddy configuration to worker dummy contexts.
Key Changes:
- Introduced
WithWorkerRequestOptionsto allow passing request options to worker initialization - Refactored worker struct to store
requestOptionsinstead of justenv, enabling flexible configuration - Moved Mercure hub assignment to occur earlier in the Caddy module provisioning phase
Reviewed changes
Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| worker.go | Replaced env field with requestOptions in worker struct; appends document root and prepared env to options during initialization |
| threadworker.go | Simplified worker script setup by passing all request options from worker to newDummyContext |
| options.go | Added WithWorkerRequestOptions function to support passing request options to worker initialization |
| context.go | Updated newDummyContext to use globalCtx for proper context propagation |
| caddy/workerconfig.go | Added unexported requestOptions field to store per-worker request configuration |
| caddy/module.go | Moved Mercure hub assignment earlier in Provision; sets worker requestOptions with logger and Mercure hub; includes minor code style improvements |
| caddy/app.go | Updated worker initialization to conditionally pass requestOptions (contains redundant logic that should be simplified) |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+155
to
171
| if w.requestOptions == nil { | ||
| workerOpts = append(workerOpts, | ||
| frankenphp.WithWorkerEnv(w.Env), | ||
| frankenphp.WithWorkerWatchMode(w.Watch), | ||
| frankenphp.WithWorkerMaxFailures(w.MaxConsecutiveFailures), | ||
| frankenphp.WithWorkerMaxThreads(w.MaxThreads), | ||
| ) | ||
| } else { | ||
| workerOpts = append( | ||
| workerOpts, | ||
| frankenphp.WithWorkerEnv(w.Env), | ||
| frankenphp.WithWorkerWatchMode(w.Watch), | ||
| frankenphp.WithWorkerMaxFailures(w.MaxConsecutiveFailures), | ||
| frankenphp.WithWorkerMaxThreads(w.MaxThreads), | ||
| frankenphp.WithWorkerRequestOptions(w.requestOptions...), | ||
| ) | ||
| } |
There was a problem hiding this comment.
The conditional check for w.requestOptions == nil is redundant because both branches append identical options. The code can be simplified by removing the if-else and always calling WithWorkerRequestOptions(w.requestOptions...) since it handles nil/empty slices correctly.
Suggested change
| if w.requestOptions == nil { | |
| workerOpts = append(workerOpts, | |
| frankenphp.WithWorkerEnv(w.Env), | |
| frankenphp.WithWorkerWatchMode(w.Watch), | |
| frankenphp.WithWorkerMaxFailures(w.MaxConsecutiveFailures), | |
| frankenphp.WithWorkerMaxThreads(w.MaxThreads), | |
| ) | |
| } else { | |
| workerOpts = append( | |
| workerOpts, | |
| frankenphp.WithWorkerEnv(w.Env), | |
| frankenphp.WithWorkerWatchMode(w.Watch), | |
| frankenphp.WithWorkerMaxFailures(w.MaxConsecutiveFailures), | |
| frankenphp.WithWorkerMaxThreads(w.MaxThreads), | |
| frankenphp.WithWorkerRequestOptions(w.requestOptions...), | |
| ) | |
| } | |
| workerOpts = append( | |
| workerOpts, | |
| frankenphp.WithWorkerEnv(w.Env), | |
| frankenphp.WithWorkerWatchMode(w.Watch), | |
| frankenphp.WithWorkerMaxFailures(w.MaxConsecutiveFailures), | |
| frankenphp.WithWorkerMaxThreads(w.MaxThreads), | |
| frankenphp.WithWorkerRequestOptions(w.requestOptions...), | |
| ) |
henderkes
reviewed
Nov 23, 2025
Contributor
henderkes
left a comment
henderkes
left a comment
There was a problem hiding this comment.
quick phone based questions:
|
|
||
| opts := []frankenphp.Option{ | ||
| optionsMU.RLock() | ||
| opts := make([]frankenphp.Option, 0, len(options)+len(f.Workers)+7) |
Contributor
There was a problem hiding this comment.
where's this 7 coming from?
Member
Author
There was a problem hiding this comment.
That's the number of hardcoded parameters.
Contributor
There was a problem hiding this comment.
Suggested change
| opts := make([]frankenphp.Option, 0, len(options)+len(f.Workers)+7) | |
| // we have 7 parameters | |
| opts := make([]frankenphp.Option, 0, len(options)+len(f.Workers)+7) |
| ) | ||
|
|
||
| for _, w := range f.Workers { | ||
| workerOpts := make([]frankenphp.WorkerOption, 0, len(w.requestOptions)+4) |
Contributor
There was a problem hiding this comment.
Suggested change
| workerOpts := make([]frankenphp.WorkerOption, 0, len(w.requestOptions)+4) | |
| // we have 4 parameters | |
| workerOpts := make([]frankenphp.WorkerOption, 0, len(w.requestOptions)+4) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.