engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

logging: use lazy parameter evaluation in log calls.

Browse source
This commit is contained in:
Marcin Kuzminski 2018-09-13 17:41:35 +02:00
parent b8b33988bd
commit 9033601562
57 changed files with 173 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rhodecode/integrations/__init__.py
View file

@ -66,8 +66,8 @@ def integrations_event_handler(event):
exc_info = sys.exc_info()
store_exception(id(exc_info), exc_info)
log.exception(
'failure occurred when sending event %s to integration %s' % (
event, integration))
'failure occurred when sending event %s to integration %s',
event, integration)
def includeme(config):

5
rhodecode/integrations/registry.py
View file

@ -31,8 +31,7 @@ class IntegrationTypeRegistry(collections.OrderedDict):
key = IntegrationType.key
if key in self:
log.debug(
'Overriding existing integration type %s (%s) with %s' % (
self[key], key, IntegrationType))
'Overriding existing integration type %s (%s) with %s',
self[key], key, IntegrationType)
self[key] = IntegrationType

10
rhodecode/integrations/types/hipchat.py
View file

@ -119,11 +119,11 @@ class HipchatIntegrationType(IntegrationTypeBase, CommitParsingDataHandler):
def send_event(self, event):
if event.__class__ not in self.valid_events:
log.debug('event not valid: %r' % event)
log.debug('event not valid: %r', event)
return
if event.name not in self.settings['events']:
log.debug('event ignored: %r' % event)
log.debug('event ignored: %r', event)
return
data = event.as_dict()
@ -131,7 +131,7 @@ class HipchatIntegrationType(IntegrationTypeBase, CommitParsingDataHandler):
text = '<b>%s<b> caused a <b>%s</b> event' % (
data['actor']['username'], event.name)
log.debug('handling hipchat event for %s' % event.name)
log.debug('handling hipchat event for %s', event.name)
if isinstance(event, events.PullRequestCommentEvent):
text = self.format_pull_request_comment_event(event, data)
@ -144,7 +144,7 @@ class HipchatIntegrationType(IntegrationTypeBase, CommitParsingDataHandler):
elif isinstance(event, events.RepoCreateEvent):
text = self.format_repo_create_event(data)
else:
log.error('unhandled event type: %r' % event)
log.error('unhandled event type: %r', event)
run_task(post_text_to_hipchat, self.settings, text)
@ -242,7 +242,7 @@ class HipchatIntegrationType(IntegrationTypeBase, CommitParsingDataHandler):
@async_task(ignore_result=True, base=RequestContextTask)
def post_text_to_hipchat(settings, text):
log.debug('sending %s to hipchat %s' % (text, settings['server_url']))
log.debug('sending %s to hipchat %s', text, settings['server_url'])
json_message = {
"message": text,
"color": settings.get('color', 'yellow'),

11
rhodecode/integrations/types/slack.py
View file

@ -110,11 +110,11 @@ class SlackIntegrationType(IntegrationTypeBase, CommitParsingDataHandler):
def send_event(self, event):
if event.__class__ not in self.valid_events:
log.debug('event not valid: %r' % event)
log.debug('event not valid: %r', event)
return
if event.name not in self.settings['events']:
log.debug('event ignored: %r' % event)
log.debug('event ignored: %r', event)
return
data = event.as_dict()
@ -127,7 +127,7 @@ class SlackIntegrationType(IntegrationTypeBase, CommitParsingDataHandler):
fields = None
overrides = None
log.debug('handling slack event for %s' % event.name)
log.debug('handling slack event for %s', event.name)
if isinstance(event, events.PullRequestCommentEvent):
(title, text, fields, overrides) \
@ -141,7 +141,7 @@ class SlackIntegrationType(IntegrationTypeBase, CommitParsingDataHandler):
elif isinstance(event, events.RepoCreateEvent):
title, text = self.format_repo_create_event(data)
else:
log.error('unhandled event type: %r' % event)
log.error('unhandled event type: %r', event)
run_task(post_text_to_slack, self.settings, title, text, fields, overrides)
@ -314,8 +314,7 @@ def html_to_slack_links(message):
@async_task(ignore_result=True, base=RequestContextTask)
def post_text_to_slack(settings, title, text, fields=None, overrides=None):
log.debug('sending %s (%s) to slack %s' % (
title, text, settings['service']))
log.debug('sending %s (%s) to slack %s', title, text, settings['service'])
fields = fields or []
overrides = overrides or {}

4
rhodecode/integrations/types/webhook.py
View file

@ -171,11 +171,11 @@ class WebhookIntegrationType(IntegrationTypeBase):
'handling event %s with Webhook integration %s', event.name, self)
if event.__class__ not in self.valid_events:
log.debug('event not valid: %r' % event)
log.debug('event not valid: %r', event)
return
if event.name not in self.settings['events']:
log.debug('event ignored: %r' % event)
log.debug('event ignored: %r', event)
return
data = event.as_dict()