Fix systemd watchdog feature #1525
Merged
Conversation
This file contains 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
emilevauge
reviewed
May 2, 2017
cmd/traefik/traefik.go
Outdated
| if err != nil { | ||
| log.Error("Problem with watchdog", err) | ||
| } else if t != 0 { | ||
| // Send a ping each half time given | ||
| t = t / 2 | ||
| log.Info("Watchdog activated with timer each ", t) | ||
| go func(interval time.Duration) { |
There was a problem hiding this comment.
In order to avoid panic, could you use safe.Go to launch the go routine here?
cmd/traefik/traefik.go
Outdated
| go func(interval time.Duration) { | ||
| tick := time.Tick(interval) | ||
| for range tick { | ||
| daemon.SdNotify(true, "WATCHDOG=1") | ||
| if ok, _ := daemon.SdNotify(false, "WATCHDOG=1"); ok { | ||
| log.Debug("Tick watchdog") |
There was a problem hiding this comment.
Shouldn't we log on error instead ?
ldez
added
kind/bug/fix
ldez
approved these changes
May 3, 2017
Commit coreos/go-systemd@0c088e introduce cleaning environment. First usage of sdnotify (for type=notify) was clearing NOTIFY_SOCKET environment variable. sdnotify in watchdog was unable to ping back. Fix #1353
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.
Commit coreos/go-systemd@0c088e introduce cleaning environment.
First usage of sdnotify (for type=notify) was clearing NOTIFY_SOCKET environment variable.
sdnotify in watchdog was unable to ping back.
Fix #1353