thijso/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

use new logger

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-10-11 16:31:05 +02:00
parent 6cbcd1132e
commit a692e551c0
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/cdist/exec.py
View file

@ -25,14 +25,13 @@ import subprocess
import cdist import cdist
log = logging.getLogger(__name__)
class Wrapper(object): class Wrapper(object):
def __init__(self, target_host, remote_exec, remote_copy): def __init__(self, target_host, remote_exec, remote_copy):
self.target_host = target_host self.target_host = target_host
self.remote_exec = remote_exec self.remote_exec = remote_exec
self.remote_copy = remote_copy self.remote_copy = remote_copy
self.log = logging.getLogger(self.target_host)
def remote_mkdir(self, directory): def remote_mkdir(self, directory):
"""Create directory on remote side""" """Create directory on remote side"""
@ -58,15 +57,15 @@ class Wrapper(object):
remote_prefix.append(self.target_host) remote_prefix.append(self.target_host)
args[0][:0] = remote_prefix args[0][:0] = remote_prefix
log.debug("Shell exec cmd: %s", args) self.log.debug("Shell exec cmd: %s", args)
if 'env' in kargs: if 'env' in kargs:
log.debug("Shell exec env: %s", kargs['env']) self.log.debug("Shell exec env: %s", kargs['env'])
try: try:
subprocess.check_call(*args, **kargs) subprocess.check_call(*args, **kargs)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
log.error("Code that raised the error:\n") self.log.error("Code that raised the error:\n")
if remote: if remote:
self.run_or_fail(["cat", script], remote=remote) self.run_or_fail(["cat", script], remote=remote)
@ -89,13 +88,10 @@ class Wrapper(object):
remote_prefix.append(self.target_host) remote_prefix.append(self.target_host)
args[0][:0] = remote_prefix args[0][:0] = remote_prefix
log.debug("Exec: " + " ".join(*args)) self.log.debug("Exec: " + " ".join(*args))
try: try:
subprocess.check_call(*args, **kargs) subprocess.check_call(*args, **kargs)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
raise cdist.Error("Command failed: " + " ".join(*args)) raise cdist.Error("Command failed: " + " ".join(*args))
except OSError as error: except OSError as error:
raise cdist.Error(" ".join(*args) + ": " + error.args[1]) raise cdist.Error(" ".join(*args) + ": " + error.args[1])