summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Demeester <vincent@sbr.pm>2016-09-20 16:26:21 +0200
committerGitHub <noreply@github.com>2016-09-20 16:26:21 +0200
commit6997182882f32dca3c7b5e17e3d140e18f712331 (patch)
treedc7ab2c66f5886b3f62127be18d8135d826c581a
parentbe9e3f59e625a7be05f21a23f6debfb3f6728573 (diff)
parent40868e263d7a239aa10acd922bd69ba5a943781e (diff)
downloaddocker-6997182882f32dca3c7b5e17e3d140e18f712331.tar.gz
Merge pull request #26725 from StefanScherer/log-error-to-event-log
Windows: Write fatal error to event log if running as service
-rw-r--r--cmd/dockerd/daemon_windows.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/dockerd/daemon_windows.go b/cmd/dockerd/daemon_windows.go
index babf05a847..39d5a87889 100644
--- a/cmd/dockerd/daemon_windows.go
+++ b/cmd/dockerd/daemon_windows.go
@@ -41,6 +41,9 @@ func notifySystem() {
// notifyShutdown is called after the daemon shuts down but before the process exits.
func notifyShutdown(err error) {
if service != nil {
+ if err != nil {
+ logrus.Fatal(err)
+ }
service.stopped(err)
}
}