Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

This commit is contained in:
Daniel 2012-03-13 18:00:51 -04:00
commit d25a6b7b6b
2 changed files with 17 additions and 5 deletions

View File

@ -1,8 +1,8 @@
[loggers] [loggers]
keys=root,fetch,push,recorder,message_h keys=root,fetch,push,recorder,message_h,notify
[handlers] [handlers]
keys=pypo,recorder,message_h keys=pypo,recorder,message_h,notify
[formatters] [formatters]
keys=simpleFormatter keys=simpleFormatter
@ -35,6 +35,18 @@ handlers=message_h
qualname=message_h qualname=message_h
propagate=0 propagate=0
[logger_notify]
level=DEBUG
handlers=notify
qualname=notify
propagate=0
[handler_notify]
class=logging.handlers.RotatingFileHandler
level=DEBUG
formatter=simpleFormatter
args=("/var/log/airtime/pypo/notify.log", 'a', 1000000, 5,)
[handler_pypo] [handler_pypo]
class=logging.handlers.RotatingFileHandler class=logging.handlers.RotatingFileHandler
level=DEBUG level=DEBUG

View File

@ -72,7 +72,7 @@ class Notify:
self.api_client = api_client.api_client_factory(config) self.api_client = api_client.api_client_factory(config)
def notify_media_start_playing(self, data, media_id): def notify_media_start_playing(self, data, media_id):
logger = logging.getLogger() logger = logging.getLogger("notify")
logger.debug('#################################################') logger.debug('#################################################')
logger.debug('# Calling server to update about what\'s playing #') logger.debug('# Calling server to update about what\'s playing #')
@ -83,7 +83,7 @@ class Notify:
# @pram time: time that LS started # @pram time: time that LS started
def notify_liquidsoap_status(self, msg, stream_id, time): def notify_liquidsoap_status(self, msg, stream_id, time):
logger = logging.getLogger() logger = logging.getLogger("notify")
logger.debug('#################################################') logger.debug('#################################################')
logger.debug('# Calling server to update liquidsoap status #') logger.debug('# Calling server to update liquidsoap status #')
@ -100,7 +100,7 @@ if __name__ == '__main__':
print '#########################################' print '#########################################'
# initialize # initialize
logger = logging.getLogger() logger = logging.getLogger("notify")
if options.error and options.stream_id: if options.error and options.stream_id:
try: try: