1 files changed, 16 insertions, 11 deletions
diff --git a/src/leap/eip/openvpnconnection.py b/src/leap/eip/openvpnconnection.py
index 65683485..f4d1c449 100644
--- a/src/leap/eip/openvpnconnection.py
+++ b/src/leap/eip/openvpnconnection.py
@@ -99,12 +99,9 @@ to be triggered for each one of them.
                 ovpn_verbosity=self.ovpn_verbosity)
         except eip_exceptions.EIPNoPolkitAuthAgentAvailable:
             command = args = None
-            # XXX deprecate
-            #self.missing_auth_agent = True
             raise
         except eip_exceptions.EIPNoPkexecAvailable:
             command = args = None
-            #self.missing_pkexec = True
             raise
 
         # XXX if not command, signal error.
@@ -158,7 +155,7 @@ to be triggered for each one of them.
         if self.command is None:
             raise eip_exceptions.EIPNoCommandError
         if self.subp is not None:
-            print('cowardly refusing to launch subprocess again')
+            logger.debug('cowardly refusing to launch subprocess again')
             return
         self._launch_openvpn()
 
@@ -166,8 +163,14 @@ to be triggered for each one of them.
         """
         terminates child subprocess
         """
+        # XXX we should send a quit process using management
+        # interface.
         if self.subp:
-            self.subp.terminate()
+            try:
+                self.subp.terminate()
+            except OSError:
+                logger.error('cannot terminate subprocess!'
+                             '(maybe openvpn still running?)')
 
     #
     # management methods
@@ -233,16 +236,17 @@ to be triggered for each one of them.
         """
         Send a command to openvpn and return response as list
         """
-        #logger.debug('connected? %s' % self.connected())
         if not self.connected():
             try:
-                #logger.debug('try to connect')
                 self.connect_to_management()
             except eip_exceptions.MissingSocketError:
-                #XXX capture more helpful error
-                return self.make_error()
-            except:
-                raise
+                logger.warning('missing management socket')
+                # This should only happen briefly during
+                # the first invocation. Race condition make
+                # the polling begin before management socket
+                # is ready
+                return []
+                #return self.make_error()
         try:
             if hasattr(self, 'tn'):
                 self.tn.write(cmd + "\n")
@@ -310,6 +314,7 @@ to be triggered for each one of them.
         """
         OpenVPN command: status
         """
+        #logger.debug('status called')
         status = self._send_command("status")
         return status