Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 80bfcc3

Browse files
authored
Merge pull request moby#37136 from muesli/sdnotify-api-const
Use go-systemd const instead of magic string in Linux version of dockerd
2 parents aa2d23a + 703c3c5 commit 80bfcc3

File tree

15 files changed

+319
-78
lines changed

15 files changed

+319
-78
lines changed

cmd/dockerd/daemon_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ func preNotifySystem() {
99
// notifySystem sends a message to the host when the server is ready to be used
1010
func notifySystem() {
1111
// Tell the init daemon we are accepting requests
12-
go systemdDaemon.SdNotify(false, "READY=1")
12+
go systemdDaemon.SdNotify(false, systemdDaemon.SdNotifyReady)
1313
}

daemon/listeners/listeners_linux.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {
6262
)
6363
// socket activation
6464
if tlsConfig != nil {
65-
listeners, err = activation.TLSListeners(false, tlsConfig)
65+
listeners, err = activation.TLSListeners(tlsConfig)
6666
} else {
67-
listeners, err = activation.Listeners(false)
67+
listeners, err = activation.Listeners()
6868
}
6969
if err != nil {
7070
return nil, err

vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ github.com/opencontainers/image-spec v1.0.1
7676
github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
7777

7878
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
79-
github.com/coreos/go-systemd v15
79+
github.com/coreos/go-systemd v17
8080
github.com/godbus/dbus v4.0.0
8181
github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852
8282
github.com/golang/protobuf 7a211bcf3bce0e3f1d74f9894916e6f116ae83b4

vendor/github.com/coreos/go-systemd/NOTICE

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/README.md

Lines changed: 18 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/activation/files.go

Lines changed: 17 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/activation/listeners.go

Lines changed: 47 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/activation/packetconns.go

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/daemon/sdnotify.go

Lines changed: 30 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/daemon/watchdog.go

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/dbus/dbus.go

Lines changed: 29 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)