cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'add_pid_to_logging' of git://github.com/mcodd/ansible into devel

Browse source
This commit is contained in:
Michael DeHaan 2013-04-28 20:52:53 -04:00
commit ba8f2fca26
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/callbacks.py
View file

@ -29,7 +29,9 @@ from ansible.color import stringc
import logging import logging
if constants.DEFAULT_LOG_PATH != '': if constants.DEFAULT_LOG_PATH != '':
logging.basicConfig(filename=constants.DEFAULT_LOG_PATH, level=logging.DEBUG, format='%(asctime)s %(message)s') logging.basicConfig(filename=constants.DEFAULT_LOG_PATH, level=logging.DEBUG, format='%(asctime)s %(name)s %(message)s')
mypid = os.getpid()
logger = logging.getLogger(str(mypid))
callback_plugins = [x for x in utils.plugins.callback_loader.all()] callback_plugins = [x for x in utils.plugins.callback_loader.all()]
@ -106,9 +108,9 @@ def display(msg, color=None, stderr=False, screen_only=False, log_only=False):
msg = msg.replace("\n","") msg = msg.replace("\n","")
if not screen_only: if not screen_only:
if color == 'red': if color == 'red':
logging.error(msg) logger.error(msg)
else: else:
logging.info(msg) logger.info(msg)
log_unflock() log_unflock()
def call_callback_module(method_name, *args, **kwargs): def call_callback_module(method_name, *args, **kwargs):