From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 3 Aug 2023 09:30:43 +0000 (+0200)
Subject: manager: cli: print error messages to sys.stderr
X-Git-Tag: v6.0.2~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=264aec21f627013d1d918e8f43bc83c04565d164;p=thirdparty%2Fknot-resolver.git

manager: cli: print error messages to sys.stderr

This is important for cases like
  kresctl convert file1 > file2
I grepped for '\<print(' and converted all error states (I think).
---

diff --git a/manager/knot_resolver_manager/cli/cmd/config.py b/manager/knot_resolver_manager/cli/cmd/config.py
index 28994d8bc..a788f38d3 100644
--- a/manager/knot_resolver_manager/cli/cmd/config.py
+++ b/manager/knot_resolver_manager/cli/cmd/config.py
@@ -244,7 +244,7 @@ class ConfigCommand(Command):
         response = request(method, url, json_dump(new_config) if new_config else None)
 
         if response.status != 200:
-            print(response)
+            print(response, file=sys.stderr)
             sys.exit(1)
 
         if self.operation == Operations.GET and self.file:
diff --git a/manager/knot_resolver_manager/cli/cmd/convert.py b/manager/knot_resolver_manager/cli/cmd/convert.py
index 9c7e5d2a7..aab2740a9 100644
--- a/manager/knot_resolver_manager/cli/cmd/convert.py
+++ b/manager/knot_resolver_manager/cli/cmd/convert.py
@@ -64,7 +64,7 @@ class ConvertCommand(Command):
             lua = KresConfig(parsed).render_lua()
             reset_global_validation_context()
         except (DataParsingError, DataValidationError) as e:
-            print(e)
+            print(e, file=sys.stderr)
             sys.exit(1)
 
         if self.output_file:
diff --git a/manager/knot_resolver_manager/cli/cmd/metrics.py b/manager/knot_resolver_manager/cli/cmd/metrics.py
index 8b9c8028e..c924ef5e7 100644
--- a/manager/knot_resolver_manager/cli/cmd/metrics.py
+++ b/manager/knot_resolver_manager/cli/cmd/metrics.py
@@ -41,5 +41,5 @@ class MetricsCommand(Command):
             else:
                 print(response.body)
         else:
-            print(response)
+            print(response, file=sys.stderr)
             sys.exit(1)
diff --git a/manager/knot_resolver_manager/cli/cmd/reload.py b/manager/knot_resolver_manager/cli/cmd/reload.py
index 5818a54c1..e0d288962 100644
--- a/manager/knot_resolver_manager/cli/cmd/reload.py
+++ b/manager/knot_resolver_manager/cli/cmd/reload.py
@@ -32,5 +32,5 @@ class ReloadCommand(Command):
         response = request("POST", f"{args.socket}/reload")
 
         if response.status != 200:
-            print(response)
+            print(response, file=sys.stderr)
             sys.exit(1)
diff --git a/manager/knot_resolver_manager/cli/cmd/schema.py b/manager/knot_resolver_manager/cli/cmd/schema.py
index 0d8a03242..790da7fdb 100644
--- a/manager/knot_resolver_manager/cli/cmd/schema.py
+++ b/manager/knot_resolver_manager/cli/cmd/schema.py
@@ -42,7 +42,7 @@ class SchemaCommand(Command):
         if self.live:
             response = request("GET", f"{args.socket}/schema")
             if response.status != 200:
-                print(response)
+                print(response, file=sys.stderr)
                 sys.exit(1)
             schema = response.body
         else:
diff --git a/manager/knot_resolver_manager/cli/cmd/stop.py b/manager/knot_resolver_manager/cli/cmd/stop.py
index e792dec33..f3539def8 100644
--- a/manager/knot_resolver_manager/cli/cmd/stop.py
+++ b/manager/knot_resolver_manager/cli/cmd/stop.py
@@ -24,7 +24,7 @@ class StopCommand(Command):
         response = request("POST", f"{args.socket}/stop")
 
         if response.status != 200:
-            print(response)
+            print(response, file=sys.stderr)
             sys.exit(1)
 
     @staticmethod
diff --git a/manager/knot_resolver_manager/cli/cmd/validate.py b/manager/knot_resolver_manager/cli/cmd/validate.py
index 0770d7573..aacd19896 100644
--- a/manager/knot_resolver_manager/cli/cmd/validate.py
+++ b/manager/knot_resolver_manager/cli/cmd/validate.py
@@ -59,5 +59,5 @@ class ValidateCommand(Command):
             KresConfig(try_to_parse(data))
             reset_global_validation_context()
         except (DataParsingError, DataValidationError) as e:
-            print(e)
+            print(e, file=sys.stderr)
             sys.exit(1)
diff --git a/manager/knot_resolver_manager/utils/requests.py b/manager/knot_resolver_manager/utils/requests.py
index ab95c5d25..db29f85e0 100644
--- a/manager/knot_resolver_manager/utils/requests.py
+++ b/manager/knot_resolver_manager/utils/requests.py
@@ -38,11 +38,14 @@ def request(
         return Response(err.code, err.read().decode("utf8"))
     except URLError as err:
         if err.errno == 111 or isinstance(err.reason, ConnectionRefusedError):
-            print("Connection refused.")
-            print(f"\tURL: {url}")
-            print("Is the URL correct?")
-            print("\tUnix socket would start with http+unix:// and URL encoded path.")
-            print("\tInet sockets would start with http:// and domain or ip")
+            msg = f"""
+                Connection refused.
+                \tURL: {url}
+                Is the URL correct?
+                \tUnix socket would start with http+unix:// and URL encoded path.
+                \tInet sockets would start with http:// and domain or ip
+            """
+            print(msg, file=sys.stderr)
         else:
             print(f"{err}: url={url}", file=sys.stderr)
         sys.exit(1)