kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix startup logging

Browse source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2017-10-19 11:09:29 -07:00
parent 239d61f04b
commit 7d0dea1055
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmd/dockerd/daemon_windows.go
View file

@ -54,9 +54,10 @@ func (cli *DaemonCli) setupConfigReloadTrap() {
sa := windows.SecurityAttributes{ sa := windows.SecurityAttributes{
Length: 0, 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 { 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 { for {
windows.WaitForSingleObject(h, windows.INFINITE) windows.WaitForSingleObject(h, windows.INFINITE)
cli.reloadConfig() cli.reloadConfig()

9
daemon/debugtrap_windows.go
View file

@ -15,10 +15,11 @@ func (d *Daemon) setupDumpStackTrap(root string) {
// Windows does not support signals like *nix systems. So instead of // 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 // trapping on SIGUSR1 to dump stacks, we wait on a Win32 event to be
// signaled. ACL'd to builtin administrators and local system // 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)") sd, err := winio.SddlToSecurityDescriptor("D:P(A;;GA;;;BA)(A;;GA;;;SY)")
if err != nil { 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 return
} }
var sa windows.SecurityAttributes var sa windows.SecurityAttributes
@ -27,11 +28,11 @@ func (d *Daemon) setupDumpStackTrap(root string) {
sa.SecurityDescriptor = uintptr(unsafe.Pointer(&sd[0])) sa.SecurityDescriptor = uintptr(unsafe.Pointer(&sd[0]))
h, err := windows.CreateEvent(&sa, 0, 0, ev) h, err := windows.CreateEvent(&sa, 0, 0, ev)
if h == 0 || err != nil { 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 return
} }
go func() { go func() {
logrus.Debugf("Stackdump - waiting signal at %s", ev) logrus.Debugf("Stackdump - waiting signal at %s", event)
for { for {
windows.WaitForSingleObject(h, windows.INFINITE) windows.WaitForSingleObject(h, windows.INFINITE)
path, err := signal.DumpStacks(root) path, err := signal.DumpStacks(root)