From 323a920f364d197265e3cbe6e13a4ef3374f8784 Mon Sep 17 00:00:00 2001
From: antoine <antoine@3bb7dfac-3a0b-4e04-842a-767bc560f471>
Date: Fri, 16 Oct 2020 12:46:06 +0000
Subject: [PATCH] #2904 socket connection warnings belong in stderr

git-svn-id: https://xpra.org/svn/Xpra/trunk@27679 3bb7dfac-3a0b-4e04-842a-767bc560f471
---
 src/xpra/scripts/main.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/xpra/scripts/main.py b/src/xpra/scripts/main.py
index dad53bbc1..c6b381928 100755
--- a/src/xpra/scripts/main.py
+++ b/src/xpra/scripts/main.py
@@ -71,6 +71,11 @@ def nox():
     warnings.filterwarnings("error", "could not open display")
     return DISPLAY
 
+def werr(*msg):
+    for x in msg:
+        noerr(sys.stderr.write, "%s\n" % (x,))
+    noerr(sys.stderr.flush)
+
 
 saved_env = {}
 
@@ -1290,8 +1295,7 @@ def socket_connect(dtype, host, port):
         if monotonic_time()-start>=CONNECT_TIMEOUT:
             break
         if retry==0:
-            log = Logger("network")
-            log.info("failed to connect to %s:%s, retrying for %i seconds", host, port, CONNECT_TIMEOUT)
+            werr("failed to connect to %s:%s, retrying for %i seconds" % (host, port, CONNECT_TIMEOUT))
         retry += 1
         import time
         time.sleep(1)
@@ -1520,13 +1524,13 @@ def socket_details(state=DotXpra.LIVE):
                 #or not found any sockets at all (DEAD),
                 #this could be a server starting up,
                 #so give it a bit of time:
-                log = Logger("network")
                 if state==DotXpra.UNKNOWN:
-                    log.info("server socket for display %s is in %s state", display, DotXpra.UNKNOWN)
+                    werr("server socket for display %s is in %s state" % (display, DotXpra.UNKNOWN))
                 else:
-                    log.info("server socket for display %s not found", display)
-                log.info(" waiting up to %i seconds", timeout)
+                    werr("server socket for display %s not found" % display)
+                werr(" waiting up to %i seconds" % timeout)
                 start = monotonic_time()
+                log = Logger("network")
                 while monotonic_time()-start<timeout:
                     state = dotxpra.get_display_state(display)
                     log("get_display_state(%s)=%s", display, state)
@@ -1595,23 +1599,19 @@ def do_setup_connection():
             protocol.start()
         except InitInfo as e:
             log("do_setup_connection() display_desc=%s", display_desc, exc_info=True)
-            log.info("failed to connect:")
-            log.info(" %s", e)
+            werr("failed to connect:", " %s" % e)
             GLib.idle_add(app.quit, EXIT_OK)
         except InitExit as e:
             log("do_setup_connection() display_desc=%s", display_desc, exc_info=True)
-            log.warn("Warning: failed to connect:")
-            log.warn(" %s", e)
+            werr("Warning: failed to connect:", " %s" % e)
             GLib.idle_add(app.quit, e.status)
         except InitException as e:
             log("do_setup_connection() display_desc=%s", display_desc, exc_info=True)
-            log.warn("Warning: failed to connect:")
-            log.warn(" %s", e)
+            werr("Warning: failed to connect:", " %s" % e)
             GLib.idle_add(app.quit, EXIT_CONNECTION_FAILED)
         except Exception as e:
             log.error("do_setup_connection() display_desc=%s", display_desc, exc_info=True)
-            log.error("Error: failed to connect:")
-            log.error(" %s", e)
+            werr("Error: failed to connect:", " %s", e)
             GLib.idle_add(app.quit, EXIT_CONNECTION_FAILED)
     def setup_connection():
         log("setup_connection() starting setup-connection thread")