Revert "containers/osbuild-composer: wait for fluentd in entrypoint"

This reverts commit b4cf032239.
No longer needed after removing sidecar COMPOSER-2051
This commit is contained in:
Diaa Sami 2023-11-27 13:52:29 +01:00 committed by Sanne Raymaekers
parent 4050aa92fe
commit 6b6af41e1d

View file

@ -20,9 +20,6 @@ import time
class Cli(contextlib.AbstractContextManager): class Cli(contextlib.AbstractContextManager):
"""Command Line Interface""" """Command Line Interface"""
SYSLOG_RETRIES=5
SYSLOG_WAIT=2.0
def __init__(self, argv): def __init__(self, argv):
self.args = None self.args = None
self._argv = argv self._argv = argv
@ -286,25 +283,6 @@ class Cli(contextlib.AbstractContextManager):
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
) )
@staticmethod
def _wait_for_syslog(addr):
print("Waiting for fluentd syslog server", file=sys.stderr)
for _ in range(Cli.SYSLOG_RETRIES):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
try:
sock.connect(addr)
except ConnectionRefusedError:
time.sleep(Cli.SYSLOG_WAIT)
continue
except (NameError, ConnectionError) as ex:
print("Unexpected error:", ex , file=sys.stderr)
break
finally:
sock.close()
print("fluentd syslog server is up", file=sys.stderr)
break
@staticmethod @staticmethod
def _spawn_composer(sockets): def _spawn_composer(sockets):
cmd = [ cmd = [
@ -359,9 +337,6 @@ class Cli(contextlib.AbstractContextManager):
proc_worker = self._spawn_worker() proc_worker = self._spawn_worker()
if any([self.args.weldr_api, self.args.composer_api, self.args.local_worker_api, self.args.remote_worker_api]): if any([self.args.weldr_api, self.args.composer_api, self.args.local_worker_api, self.args.remote_worker_api]):
if "SYSLOG_SERVER" in os.environ:
addr, port = os.environ["SYSLOG_SERVER"].split(":")
self._wait_for_syslog((addr, int(port)))
proc_composer = self._spawn_composer(sockets) proc_composer = self._spawn_composer(sockets)
if proc_composer: if proc_composer: