Skip to content

fix: don't log graceful watcher shutdown as error #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
endigma merged 3 commits into from
Aug 26, 2025
Merged

fix: don't log graceful watcher shutdown as error #2168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3f18092
fix: don't log errors when execution config watcher shuts down
endigma Aug 26, 2025
2159a71
chore: allow using .env for CDN JWT secret
endigma Aug 26, 2025
7b1aec0
chore: uncomment local execution config for debug JSON
endigma Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ services:
environment:
PORT: 11000
NODE_ENV: development
AUTH_JWT_SECRET: fkczyomvdprgvtmvkuhvprxuggkbgwld
AUTH_JWT_SECRET: ${CDN_AUTH_JWT_SECRET:-fkczyomvdprgvtmvkuhvprxuggkbgwld}
AUTH_ADMISSION_JWT_SECRET: uXDxJLEvrw4aafPfrf3rRotCoBzRfPEW
S3_STORAGE_URL: ${S3_STORAGE_URL:-http://${MINIO_ROOT_USER:-minio}:${MINIO_ROOT_PASSWORD:-changeme}@minio:9000/cosmo}
S3_REGION: ${S3_REGION_CDN:-${S3_REGION:-auto}}
Expand Down
6 changes: 3 additions & 3 deletions router/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ func Main() {
)
}

watchFunc, err := watcher.New(watcher.Options{
w, err := watcher.New(watcher.Options{
Interval: result.Config.WatchConfig.Interval,
Logger: ll,
Paths: *configPathFlag,
Expand All @@ -203,9 +203,9 @@ func Main() {
// different instances of the router
time.Sleep(startupDelay)

if err := watchFunc(rootCtx); err != nil {
if err := w(rootCtx); err != nil {
if !errors.Is(err, context.Canceled) {
ll.Error("Error watching execution config", zap.Error(err))
ll.Error("Error watching router config", zap.Error(err))
} else {
ll.Debug("Watcher context cancelled, shutting down")
}
Expand Down
7 changes: 5 additions & 2 deletions router/core/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,8 +1201,11 @@ func (r *Router) Start(ctx context.Context) error {

go func() {
if err := w(ctx); err != nil {
r.logger.Error("Error watching execution config", zap.Error(err))
return
if !errors.Is(err, context.Canceled) {
ll.Error("Error watching execution config", zap.Error(err))
} else {
ll.Debug("Watcher context cancelled, shutting down")
}
}
}()

Expand Down
7 changes: 4 additions & 3 deletions router/debug.config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@

version: '1'

# execution_config:
# file:
# path: './__schemas/config.json'
execution_config:
file:
path: './__schemas/config.json'
watch: true

log_level: debug

Expand Down
Loading