From 6b6af41e1d7ead3c115023227b2a4cb53b30af0a Mon Sep 17 00:00:00 2001
From: Diaa Sami <disami@redhat.com>
Date: Mon, 27 Nov 2023 13:52:29 +0100
Subject: [PATCH] Revert "containers/osbuild-composer: wait for fluentd in
 entrypoint"

This reverts commit b4cf032239e4d8ebe17934439d14a492f158e158.
No longer needed after removing sidecar COMPOSER-2051
---
 containers/osbuild-composer/entrypoint.py | 25 -----------------------
 1 file changed, 25 deletions(-)

diff --git a/containers/osbuild-composer/entrypoint.py b/containers/osbuild-composer/entrypoint.py
index 6975a9fd8..8fc0b093b 100644
--- a/containers/osbuild-composer/entrypoint.py
+++ b/containers/osbuild-composer/entrypoint.py
@@ -20,9 +20,6 @@ import time
 class Cli(contextlib.AbstractContextManager):
     """Command Line Interface"""
 
-    SYSLOG_RETRIES=5
-    SYSLOG_WAIT=2.0
-
     def __init__(self, argv):
         self.args = None
         self._argv = argv
@@ -286,25 +283,6 @@ class Cli(contextlib.AbstractContextManager):
             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
     def _spawn_composer(sockets):
         cmd = [
@@ -359,9 +337,6 @@ class Cli(contextlib.AbstractContextManager):
                 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 "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)
 
             if proc_composer: