From ba75ae4ccc4da5fd74f9440e84c6cf30dcbc72ff Mon Sep 17 00:00:00 2001 From: John Garland Date: Thu, 1 Mar 2012 18:15:09 +1100 Subject: [PATCH] Execute: make running commands asynchronous This prevents deluge from hanging while it waits for a command to finish. This also prevents a deadlock from occuring (c.f. warning at http://docs.python.org/library/subprocess.html#subprocess.Popen.wait) --- deluge/plugins/Execute/deluge/plugins/execute/core.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/deluge/plugins/Execute/deluge/plugins/execute/core.py b/deluge/plugins/Execute/deluge/plugins/execute/core.py index cc7e10572..5a9fc3526 100644 --- a/deluge/plugins/Execute/deluge/plugins/execute/core.py +++ b/deluge/plugins/Execute/deluge/plugins/execute/core.py @@ -37,7 +37,7 @@ import os import time import hashlib import logging -from subprocess import Popen, PIPE +from twisted.internet.utils import getProcessValue from deluge.plugins.pluginbase import CorePluginBase import deluge.component as component @@ -112,15 +112,18 @@ class Core(CorePluginBase): log.debug("[execute] Running commands for %s", event) + def log_error(exit_code, command): + if exit_code: + log.warn("[execute] command '%s' failed with exit code %d", command, exit_code) + # Go through and execute all the commands for command in self.config["commands"]: if command[EXECUTE_EVENT] == event: command = os.path.expandvars(command[EXECUTE_COMMAND]) command = os.path.expanduser(command) log.debug("[execute] running %s", command) - p = Popen([command, torrent_id, torrent_name, save_path], stdin=PIPE, stdout=PIPE, stderr=PIPE) - if p.wait() != 0: - log.warn("Execute command failed with exit code %d", p.returncode) + d = getProcessValue(command, (torrent_id, torrent_name, save_path), env=os.environ) + d.addCallback(log_error, command) def disable(self): self.config.save()