codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Execute: log stdout/stderr when command fails

This commit is contained in:
John Garland 2012-03-02 12:54:33 +11:00
parent b0029517eb
commit be75d5021b
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
deluge/plugins/execute/execute/core.py
View File

@ -36,7 +36,7 @@
import os import os
import time import time
import hashlib import hashlib
from twisted.internet.utils import getProcessValue from twisted.internet.utils import getProcessOutputAndValue
from deluge.log import LOG as log from deluge.log import LOG as log
from deluge.plugins.pluginbase import CorePluginBase from deluge.plugins.pluginbase import CorePluginBase
@ -110,9 +110,14 @@ class Core(CorePluginBase):
log.debug("[execute] Running commands for %s", event) log.debug("[execute] Running commands for %s", event)
def log_error(exit_code, command): def log_error(result, command):
(stdout, stderr, exit_code) = result
if exit_code: if exit_code:
log.warn("[execute] command '%s' failed with exit code %d", command, exit_code) log.warn("[execute] command '%s' failed with exit code %d", command, exit_code)
if stdout:
log.warn("[execute] stdout: %s", stdout)
if stderr:
log.warn("[execute] stderr: %s", stderr)
# Go through and execute all the commands # Go through and execute all the commands
for command in self.config["commands"]: for command in self.config["commands"]:
@ -120,7 +125,7 @@ class Core(CorePluginBase):
command = os.path.expandvars(command[EXECUTE_COMMAND]) command = os.path.expandvars(command[EXECUTE_COMMAND])
command = os.path.expanduser(command) command = os.path.expanduser(command)
log.debug("[execute] running %s", command) log.debug("[execute] running %s", command)
d = getProcessValue(command, (torrent_id, torrent_name, save_path), env=os.environ) d = getProcessOutputAndValue(command, (torrent_id, torrent_name, save_path), env=os.environ)
d.addCallback(log_error, command) d.addCallback(log_error, command)
def disable(self): def disable(self):