Skip to content

Commit ce0296e

Browse files
committed
Fix error logging for provider failures
1 parent 0ba2ea6 commit ce0296e

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

internal/pkg/composable/controller.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,11 @@ func (c *controller) startContextProvider(ctx context.Context, wg *sync.WaitGrou
469469
return
470470
}
471471
// all other exits are bad, even a nil error
472-
l.Errorf("provider %q failed to run (will retry in %s): %s", name, c.restartInterval.String(), err)
472+
cause := "exited unexpectedly with nil error"
473+
if err != nil {
474+
cause = err.Error()
475+
}
476+
l.Errorf("provider %q failed to run (will retry in %s): %s", name, c.restartInterval.String(), cause)
473477
if fpok {
474478
// turn off fetch provider
475479
sendFetchProvider(ctx, fetchCh, name, nil)
@@ -527,7 +531,11 @@ func (c *controller) startDynamicProvider(ctx context.Context, wg *sync.WaitGrou
527531
return
528532
}
529533
// all other exits are bad, even a nil error
530-
l.Errorf("provider %q failed to run (will restart in %s): %s", name, c.restartInterval.String(), err)
534+
cause := "exited unexpectedly with nil error"
535+
if err != nil {
536+
cause = err.Error()
537+
}
538+
l.Errorf("provider %q failed to run (will restart in %s): %s", name, c.restartInterval.String(), cause)
531539
select {
532540
case <-ctx.Done():
533541
return

0 commit comments

Comments
 (0)