Revert "client/tests: don't do dup2() dance to pass file descriptor to "tools/test-cloud-meta-mock.py""
This changed the fd passing protocol making it not compatible with
systemd-socket-activate(1).
This reverts commit 342ee618c7
.
This commit is contained in:

committed by
Thomas Haller

parent
751ee63e61
commit
2e8ff9f8a0
@@ -68,9 +68,11 @@ class SocketHTTPServer(HTTPServer):
|
||||
|
||||
|
||||
# See sd_listen_fds(3)
|
||||
fileno = os.getenv("LISTEN_FD")
|
||||
fileno = os.getenv("LISTEN_FDS")
|
||||
if fileno is not None:
|
||||
s = socket.socket(fileno=int(fileno))
|
||||
if fileno != "1":
|
||||
raise Exception("Bad LISTEN_FDS")
|
||||
s = socket.socket(fileno=3)
|
||||
else:
|
||||
addr = ("localhost", 0)
|
||||
s = socket.socket()
|
||||
|
Reference in New Issue
Block a user