Skip to content

Commit

Permalink
add logging of triggers
Browse files Browse the repository at this point in the history
  • Loading branch information
pvreman committed May 10, 2010
1 parent a6e4617 commit f71664b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion cobbler/remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,7 @@ def run_install_triggers(self,mode,objtype,name,ip,token=None,**rest):
# time if reinstalling all of a cluster all at once.
# we can do that at "cobbler check" time.

utils.run_triggers(self.api, None, "/var/lib/cobbler/triggers/install/%s/*" % mode, additional=[objtype,name,ip])
utils.run_triggers(self.api, None, "/var/lib/cobbler/triggers/install/%s/*" % mode, additional=[objtype,name,ip],logger=self.logger)


return True
Expand Down
8 changes: 8 additions & 0 deletions cobbler/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -844,20 +844,26 @@ def run_triggers(api,ref,globber,additional=[],logger=None):

# Python triggers first, before shell

if logger is not None:
logger.debug("running python triggers from %s" % globber)
modules = api.get_modules_in_category(globber)
for m in modules:
arglist = []
if ref:
arglist.append(ref.name)
for x in additional:
arglist.append(x)
if logger is not None:
logger.debug("running python trigger %s" % m.__name__)
rc = m.run(api, arglist, logger)
if rc != 0:
raise CX("cobbler trigger failed: %s" % m.__name__)

# now do the old shell triggers, which are usually going to be slower, but are easier to write
# and support any language

if logger is not None:
logger.debug("running shell triggers from %s" % globber)
triggers = glob.glob(globber)
triggers.sort()
for file in triggers:
Expand All @@ -871,6 +877,8 @@ def run_triggers(api,ref,globber,additional=[],logger=None):
arglist.append(ref.name)
for x in additional:
arglist.append(x)
if logger is not None:
logger.debug("running shell trigger %s" % file)
rc = subprocess_call(logger, arglist, shell=False) # close_fds=True)
except:
if logger is not None:
Expand Down

0 comments on commit f71664b

Please sign in to comment.