#669:

* improve debug logging
* don't try to call terminate() on the subprocess if it has exited already
* docstrings

git-svn-id: https://xpra.org/svn/Xpra/trunk@8977 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/net/subprocess_wrapper.py

@@ -157,6 +157,7 @@ def stop(self):
         if p:
             self.protocol = None
             p.close()
+        log("stop() stopping mainloop %s", self.mainloop)
         self.mainloop.quit()
 
     def handle_signal(self, sig, frame):
@@ -295,9 +296,9 @@ def cleanup(self):
         self.stop()
 
     def stop(self):
-        log("%s.stop()", self)
+        log("stop() sending stop request to %s", self.description)
         proc = self.process
-        if proc:
+        if proc and proc.poll() is None:
             try:
                 proc.terminate()
                 self.process = None
@@ -306,6 +307,7 @@ def stop(self):
         p = self.protocol
         if p:
             self.protocol = None
+            log("%s.stop() calling %s", self, p.close)
             try:
                 p.close()
             except Exception as e:

src/xpra/sound/wrapper.py

@@ -61,6 +61,7 @@ def stop(self):
         wo = self.wrapped_object
         log("stop() wrapped object=%s", wo)
         if wo:
+            #this will stop the sound pipeline:
             self.wrapped_object = None
             wo.cleanup()
         #this will stop the protocol and main loop