Prevent uninstall subprocess from exiting when the service is stopped.

Author: jburhenn

myDevices/cloud/client.py

@@ -422,7 +422,7 @@ def ProcessAgentCommand(self, message):
         error = None
         try:
             if message['suffix'] == 'uninstall':
-                output, result = executeCommand('sudo /etc/myDevices/uninstall/uninstall.sh')
+                output, result = executeCommand('sudo /etc/myDevices/uninstall/uninstall.sh', disablePipe=True)
                 debug('ProcessAgentCommand: {}, result: {}, output: {}'.format(message, result, output))
                 if result != 0:
                     error = 'Error uninstalling agent'
@@ -434,6 +434,8 @@ def ProcessAgentCommand(self, message):
             #         else:
             #             info('Set config item: {} {}'.format(key, value))
             #             self.config.set('Agent', key, value)
+            else:
+                error = 'Unknown agent command: {}'.format(message['suffix'])
         except Exception as ex:
             error = '{}: {}'.format(type(ex).__name__, ex)
         self.EnqueueCommandResponse(message, error)
@@ -495,7 +497,7 @@ def ProcessDeviceCommand(self, message):
             elif message['suffix'] == 'delete':
                 result = self.sensorsClient.RemoveSensor(payload['sensorId'])
             else:
-                info('Unknown device command: {}'.format(message['suffix']))
+                error = 'Unknown device command: {}'.format(message['suffix'])
             debug('ProcessDeviceCommand result: {}'.format(result))
             if result is False:
                 error = 'Device command failed'

myDevices/utils/subprocess.py

@@ -1,7 +1,7 @@
 """
 This module contains functions for launching subprocesses and returning output from them.
 """
-from subprocess import Popen, PIPE
+from subprocess import Popen, PIPE, DEVNULL
 from myDevices.utils.logger import debug, info, error, exception
 
 def setMemoryLimits():
@@ -13,16 +13,20 @@ def setMemoryLimits():
     except:
         pass
 
-def executeCommand(command, increaseMemoryLimit=False):
+def executeCommand(command, increaseMemoryLimit=False, disablePipe=False):
     """Execute a specified command, increasing the processes memory limits if specified"""
     debug('executeCommand: ' +  command)
     output = ''
     returncode = 1
     try:
-        setLimit = None
+        preexec = None
+        pipe = PIPE
         if increaseMemoryLimit:
-            setLimit = setMemoryLimits
-        process = Popen(command, stdout=PIPE, stderr=PIPE, shell=True, preexec_fn=setLimit)
+            preexec = setMemoryLimits
+        if disablePipe:
+            debug('Disable pipe to prevent child exiting when parent exits')
+            pipe = DEVNULL
+        process = Popen(command, stdout=pipe, stderr=pipe, shell=True, preexec_fn=preexec)
         (stdout_data, stderr_data) = process.communicate()
         returncode = process.wait()
         returncode = process.returncode