return empty list when passenger status times out

ganglia · Oct 3, 2012 · 83858b3 · 83858b3
1 parent 4352af0
commit 83858b3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/passenger/python_modules/passenger.py b/passenger/python_modules/passenger.py
@@ -192,7 +192,7 @@ def timeout_command(command, timeout):
         if (now - start).seconds> timeout:
             os.system("sudo kill %s" % process.pid)
             os.waitpid(-1, os.WNOHANG)
-            return None
+            return []
     return process.stdout.readlines()
 
 if __name__ == '__main__':