From d03ac8e0179f6f909f0c5ab0b5c9ad1e21dbf1f9 Mon Sep 17 00:00:00 2001 From: John Howard Date: Thu, 19 Oct 2017 11:09:29 -0700 Subject: [PATCH] Fix startup logging Signed-off-by: John Howard Upstream-commit: 7d0dea10557e01865d67aa90c43b294fa6b36c42 Component: engine --- components/engine/cmd/dockerd/daemon_windows.go | 5 +++-- components/engine/daemon/debugtrap_windows.go | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/components/engine/cmd/dockerd/daemon_windows.go b/components/engine/cmd/dockerd/daemon_windows.go index 77bade2de3..354a5f055e 100644 --- a/components/engine/cmd/dockerd/daemon_windows.go +++ b/components/engine/cmd/dockerd/daemon_windows.go @@ -54,9 +54,10 @@ func (cli *DaemonCli) setupConfigReloadTrap() { sa := windows.SecurityAttributes{ Length: 0, } - ev, _ := windows.UTF16PtrFromString("Global\\docker-daemon-config-" + fmt.Sprint(os.Getpid())) + event := "Global\\docker-daemon-config-" + fmt.Sprint(os.Getpid()) + ev, _ := windows.UTF16PtrFromString(event) if h, _ := windows.CreateEvent(&sa, 0, 0, ev); h != 0 { - logrus.Debugf("Config reload - waiting signal at %s", ev) + logrus.Debugf("Config reload - waiting signal at %s", event) for { windows.WaitForSingleObject(h, windows.INFINITE) cli.reloadConfig() diff --git a/components/engine/daemon/debugtrap_windows.go b/components/engine/daemon/debugtrap_windows.go index f7d95c0365..916bbb4ebc 100644 --- a/components/engine/daemon/debugtrap_windows.go +++ b/components/engine/daemon/debugtrap_windows.go @@ -15,10 +15,11 @@ func (d *Daemon) setupDumpStackTrap(root string) { // Windows does not support signals like *nix systems. So instead of // trapping on SIGUSR1 to dump stacks, we wait on a Win32 event to be // signaled. ACL'd to builtin administrators and local system - ev, _ := windows.UTF16PtrFromString("Global\\docker-daemon-" + fmt.Sprint(os.Getpid())) + event := "Global\\docker-daemon-" + fmt.Sprint(os.Getpid()) + ev, _ := windows.UTF16PtrFromString(event) sd, err := winio.SddlToSecurityDescriptor("D:P(A;;GA;;;BA)(A;;GA;;;SY)") if err != nil { - logrus.Errorf("failed to get security descriptor for debug stackdump event %s: %s", ev, err.Error()) + logrus.Errorf("failed to get security descriptor for debug stackdump event %s: %s", event, err.Error()) return } var sa windows.SecurityAttributes @@ -27,11 +28,11 @@ func (d *Daemon) setupDumpStackTrap(root string) { sa.SecurityDescriptor = uintptr(unsafe.Pointer(&sd[0])) h, err := windows.CreateEvent(&sa, 0, 0, ev) if h == 0 || err != nil { - logrus.Errorf("failed to create debug stackdump event %s: %s", ev, err.Error()) + logrus.Errorf("failed to create debug stackdump event %s: %s", event, err.Error()) return } go func() { - logrus.Debugf("Stackdump - waiting signal at %s", ev) + logrus.Debugf("Stackdump - waiting signal at %s", event) for { windows.WaitForSingleObject(h, windows.INFINITE) path, err := signal.DumpStacks(root)