add debug logging

git-svn-id: https://xpra.org/svn/Xpra/trunk@9338 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · May 13, 2015 · e2e0520 · e2e0520
1 parent 23e87db
commit e2e0520
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/xpra/net/bytestreams.py b/src/xpra/net/bytestreams.py
@@ -174,16 +174,18 @@ def close(self):
         Connection.close(self)
         try:
             self._readable.close()
-        except:
-            pass
+        except Exception as e:
+            log("%s.close() %s", self._readable, e)
         try:
             self._writeable.close()
         except:
-            pass
+            log("%s.close() %s", self._writeable, e)
         cc = self._close_cb
         if cc:
             self._close_cb = None
+            log("%s.close() calling %s", self, cc)
             cc()
+        log("%s.close() done", self)
 
     def __repr__(self):
         return "TwoFileConnection(%s)" % str(self.target)

diff --git a/src/xpra/net/protocol.py b/src/xpra/net/protocol.py
@@ -872,7 +872,7 @@ def wait_for_write_lock(timeout=100):
         wait_for_write_lock()
 
     def close(self):
-        log("close() closed=%s", self._closed)
+        log("Protocol.close() closed=%s", self._closed)
         if self._closed:
             return
         self._closed = True
@@ -894,6 +894,7 @@ def close(self):
             self._conn = None
         self.terminate_queue_threads()
         self.idle_add(self.clean)
+        log("Protocol.close() done")
 
     def steal_connection(self, read_callback=None):
         #so we can re-use this connection somewhere else

diff --git a/src/xpra/net/subprocess_wrapper.py b/src/xpra/net/subprocess_wrapper.py
@@ -318,7 +318,7 @@ def stop(self):
         self.stop_protocol()
 
     def stop_process(self):
-        log("stop() sending stop request to %s", self.description)
+        log("%s.stop_process() sending stop request to %s", self, self.description)
         proc = self.process
         if proc and proc.poll() is None:
             try:
@@ -331,7 +331,7 @@ def stop_protocol(self):
         p = self.protocol
         if p:
             self.protocol = None
-            log("%s.stop() calling %s", self, p.close)
+            log("%s.stop_protocol() calling %s", self, p.close)
             try:
                 p.close()
             except Exception as e: