gnetcli-adapter 2.1.0__tar.gz → 2.2.1__tar.gz

{gnetcli_adapter-2.1.0 → gnetcli_adapter-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gnetcli_adapter
-Version: 2.1.0
+Version: 2.2.1
 Summary: Gnetcli-server adapter for Annet
 Author-email: Aleksandr Balezin <gescheit12@gmail.com>
 Requires-Python: >=3.10

{gnetcli_adapter-2.1.0 → gnetcli_adapter-2.2.1}/src/gnetcli_adapter/gnetcli_adapter.py

@@ -162,7 +162,7 @@ def run_gnetcli_server(server_path: str, config: str = DEFAULT_GNETCLI_SERVER_CO
     try:
         proc = subprocess.Popen(
             [gnetcli_abs_path, "--conf-file", "-"],
-            stdout=subprocess.PIPE,
+            stdout=subprocess.DEVNULL, # we do not read stdout
             stderr=subprocess.PIPE,
             stdin=subprocess.PIPE,
             bufsize=1,
@@ -188,6 +188,8 @@ def run_gnetcli_server(server_path: str, config: str = DEFAULT_GNETCLI_SERVER_CO
                 else:
                     if data.get("msg") == "init tcp socket":
                         _local_gnetcli_url = data.get("address")
+                    if data.get("msg") == "init unix socket":
+                        _local_gnetcli_url = "unix:" + data.get("path")
                     if data.get("level") == "panic":
                         _logger.error("gnetcli error %s", data)
     _logger.debug("set gnetcli server exit code %s", proc.returncode)
@@ -499,10 +501,10 @@ class GnetcliDeployer(DeployDriver, AdapterWithConfig, AdapterWithName):
                         # we can't execute subsequent commands
                         if cmd.suppress_eof:
                             # some commands left
-                            if group_number + 1  != len(command_groups) or cmd_number + 1 != len(cmd):
+                            if group_number + 1  != len(command_groups) or cmd_number + 1 != len(cmdlist):
                                 tracker.command_done_error("EOF detected before all commands executed.")
                                 seen_exc.append(Exception("EOF detected before all commands executed."))
-                            tracker.command_done_error("Suppressed EOF")
+                            tracker.command_done_error_suppressed("Suppressed EOF")
                             return seen_exc, results
                         seen_exc.append(e)
                         tracker.command_done_error("Unexpected EOFError")

{gnetcli_adapter-2.1.0 → gnetcli_adapter-2.2.1}/src/gnetcli_adapter/progress_tracker.py

@@ -44,6 +44,9 @@ class ProgressTracker:
     def command_done_error(self, error: str) -> None:
         pass
 
+    def command_done_error_suppressed(self, error: str) -> None:
+        pass
+
     def finish_ok(self, notification: str) -> None:
         pass
 
@@ -126,7 +129,6 @@ class ProgressBarTracker(ProgressTracker):
         )
 
     def command_done_error(self, error: str) -> None:
-        logger.error(error)
         self.done_steps += 1
         self.progress_bar.add_content(self.tile, error)
         self.progress_bar.set_progress(
@@ -136,6 +138,16 @@ class ProgressBarTracker(ProgressTracker):
             "Error: " + self.last_cmd,
         )
 
+    def command_done_error_suppressed(self, error: str) -> None:
+        self.done_steps += 1
+        self.progress_bar.add_content(self.tile, error)
+        self.progress_bar.set_progress(
+            self.tile,
+            self.done_steps,
+            self.total_steps,
+            "Error (suppressed): " + self.last_cmd,
+        )
+
     def finish_ok(self, notification: str) -> None:
         self.done_steps = self.total_steps
         self.progress_bar.set_progress(self.tile,self.done_steps, self.total_steps, suffix=notification)
@@ -199,6 +211,9 @@ class FileProgressTracker(ProgressTracker):
     def command_done_error(self, error: str) -> None:
         self._log(f"Error: {error}")
 
+    def command_done_error_suppressed(self, error: str) -> None:
+        self._log(f"Error (suppressed): {error}")
+
     def finish_ok(self, notification: str) -> None:
         self._log("Finished with success: " + notification)
 
@@ -231,6 +246,9 @@ class LogProgressTracker(ProgressTracker):
     def command_done_error(self, error: str) -> None:
         logger.error(f"{self.fqdn} - {error}")
 
+    def command_done_error_suppressed(self, error: str) -> None:
+        logger.info(f"{self.fqdn} - {error}")
+
     def finish_ok(self, notification: str) -> None:
         logger.info(f"{self.fqdn} - finished with success - {notification}")
 
@@ -287,6 +305,10 @@ class CompositeTracker(ProgressTracker):
         for tracker in self.trackers:
             tracker.command_done_error(error)
 
+    def command_done_error_suppressed(self, error: str) -> None:
+        for tracker in self.trackers:
+            tracker.command_done_error_suppressed(error)
+
     def finish_ok(self, notification: str) -> None:
         for tracker in self.trackers:
             tracker.finish_ok(notification)