activation: add support for listeners with names #251

vincentbernat · 2018-02-27T15:42:50Z

Since v227, systemd can name each listener. This is useful when you
have different socket units activating the same service: you can't
really know in which order the socket will be provided. Systemd adds
an environment variable named LISTEN_FDNAMES for this purpose.

We encapsulate the name in the File object created from the file
descriptor. Unfortunately, once this is turned into a net.Listener,
there doesn't seem to have a way to fetch this information
back. Therefore, two new functions are provided to be able to easily
get named sockets.

The same could be done to PacketConns in the future.

lucab · 2018-03-19T13:59:12Z

activation/listeners.go

+	listeners := map[string][]net.Listener{}
+
+	for _, f := range files {
+		if pc, err := net.FileListener(f); err == nil {


I think this would benefit from the same conditional Close we are discussing at #250.

lucab · 2018-03-19T14:00:53Z

For reference, this PR looks fine overall. I was just blocked trying to get a better view on #250.

Since v227, systemd can name each listener. This is useful when you have different socket units activating the same service: you can't really know in which order the socket will be provided. Systemd adds an environment variable named LISTEN_FDNAMES for this purpose. We encapsulate the name in the File object created from the file descriptor. Unfortunately, once this is turned into a net.Listener, there doesn't seem to have a way to fetch this information back. Therefore, two new functions are provided to be able to easily get named sockets. The same could be done to PacketConns in the future.

vincentbernat · 2018-03-19T14:12:39Z

I have also updated this PR. It should merge cleanly once #250 is merged.

lucab

LGTM

- https://github.com/coreos/go-systemd/compare/v14..v19 - coreos/go-systemd#248 dbus: add SetPropertiesSubscriber method - coreos/go-systemd#251 activation: add support for listeners with names - coreos/go-systemd#296 dbus: Fix API break from godbus - coreos/pkg@v3...v4 - no changes in vendored code - https://github.com/godbus/dbus/compare/v3..v5.0.1 - godbus/dbus#89 introduce MakeVariantWithSignature Signed-off-by: Sebastiaan van Stijn <[email protected]>

- https://github.com/coreos/go-systemd/compare/v14..v19 - coreos/go-systemd#248 dbus: add SetPropertiesSubscriber method - coreos/go-systemd#251 activation: add support for listeners with names - coreos/go-systemd#296 dbus: Fix API break from godbus - https://github.com/godbus/dbus/compare/v3..v5.0.1 - godbus/dbus#89 introduce MakeVariantWithSignature Signed-off-by: Sebastiaan van Stijn <[email protected]>

vincentbernat force-pushed the features/fdnames branch from 162e101 to 1e6da64 Compare February 28, 2018 16:31

lucab self-requested a review February 28, 2018 17:00

lucab added the needs/review label Feb 28, 2018

lucab mentioned this pull request Feb 28, 2018

activation: close files after creating listeners #250

Merged

lucab reviewed Mar 19, 2018

View reviewed changes

lucab added needs/rework and removed needs/review labels Mar 19, 2018

vincentbernat force-pushed the features/fdnames branch from 1e6da64 to e15c4c4 Compare March 19, 2018 14:12

lucab removed the needs/rework label Mar 19, 2018

lucab approved these changes Mar 19, 2018

View reviewed changes

lucab merged commit 54f92f7 into coreos:master Mar 19, 2018

lucab changed the title ~~activation: add two functions to provide listeners with names~~ activation: add support for listeners with names May 7, 2018

lucab added this to the v17 milestone May 7, 2018

lucab added the kind/new-api label May 7, 2018

thaJeztah mentioned this pull request Mar 28, 2019

Update dependencies opencontainers/runc#2029

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

activation: add support for listeners with names #251

activation: add support for listeners with names #251

vincentbernat commented Feb 27, 2018

lucab Mar 19, 2018

lucab commented Mar 19, 2018

vincentbernat commented Mar 19, 2018

lucab left a comment

activation: add support for listeners with names #251

activation: add support for listeners with names #251

Conversation

vincentbernat commented Feb 27, 2018

lucab Mar 19, 2018

Choose a reason for hiding this comment

lucab commented Mar 19, 2018

vincentbernat commented Mar 19, 2018

lucab left a comment

Choose a reason for hiding this comment