Signed-off-by: John Howard <jhoward@microsoft.com>
| ... | ... |
@@ -54,9 +54,10 @@ func (cli *DaemonCli) setupConfigReloadTrap() {
|
| 54 | 54 |
sa := windows.SecurityAttributes{
|
| 55 | 55 |
Length: 0, |
| 56 | 56 |
} |
| 57 |
- ev, _ := windows.UTF16PtrFromString("Global\\docker-daemon-config-" + fmt.Sprint(os.Getpid()))
|
|
| 57 |
+ event := "Global\\docker-daemon-config-" + fmt.Sprint(os.Getpid()) |
|
| 58 |
+ ev, _ := windows.UTF16PtrFromString(event) |
|
| 58 | 59 |
if h, _ := windows.CreateEvent(&sa, 0, 0, ev); h != 0 {
|
| 59 |
- logrus.Debugf("Config reload - waiting signal at %s", ev)
|
|
| 60 |
+ logrus.Debugf("Config reload - waiting signal at %s", event)
|
|
| 60 | 61 |
for {
|
| 61 | 62 |
windows.WaitForSingleObject(h, windows.INFINITE) |
| 62 | 63 |
cli.reloadConfig() |
| ... | ... |
@@ -15,10 +15,11 @@ func (d *Daemon) setupDumpStackTrap(root string) {
|
| 15 | 15 |
// Windows does not support signals like *nix systems. So instead of |
| 16 | 16 |
// trapping on SIGUSR1 to dump stacks, we wait on a Win32 event to be |
| 17 | 17 |
// signaled. ACL'd to builtin administrators and local system |
| 18 |
- ev, _ := windows.UTF16PtrFromString("Global\\docker-daemon-" + fmt.Sprint(os.Getpid()))
|
|
| 18 |
+ event := "Global\\docker-daemon-" + fmt.Sprint(os.Getpid()) |
|
| 19 |
+ ev, _ := windows.UTF16PtrFromString(event) |
|
| 19 | 20 |
sd, err := winio.SddlToSecurityDescriptor("D:P(A;;GA;;;BA)(A;;GA;;;SY)")
|
| 20 | 21 |
if err != nil {
|
| 21 |
- logrus.Errorf("failed to get security descriptor for debug stackdump event %s: %s", ev, err.Error())
|
|
| 22 |
+ logrus.Errorf("failed to get security descriptor for debug stackdump event %s: %s", event, err.Error())
|
|
| 22 | 23 |
return |
| 23 | 24 |
} |
| 24 | 25 |
var sa windows.SecurityAttributes |
| ... | ... |
@@ -27,11 +28,11 @@ func (d *Daemon) setupDumpStackTrap(root string) {
|
| 27 | 27 |
sa.SecurityDescriptor = uintptr(unsafe.Pointer(&sd[0])) |
| 28 | 28 |
h, err := windows.CreateEvent(&sa, 0, 0, ev) |
| 29 | 29 |
if h == 0 || err != nil {
|
| 30 |
- logrus.Errorf("failed to create debug stackdump event %s: %s", ev, err.Error())
|
|
| 30 |
+ logrus.Errorf("failed to create debug stackdump event %s: %s", event, err.Error())
|
|
| 31 | 31 |
return |
| 32 | 32 |
} |
| 33 | 33 |
go func() {
|
| 34 |
- logrus.Debugf("Stackdump - waiting signal at %s", ev)
|
|
| 34 |
+ logrus.Debugf("Stackdump - waiting signal at %s", event)
|
|
| 35 | 35 |
for {
|
| 36 | 36 |
windows.WaitForSingleObject(h, windows.INFINITE) |
| 37 | 37 |
path, err := signal.DumpStacks(root) |