mirror of
https://git.anonymousland.org/anonymousland/synapse-product.git
synced 2024-10-01 08:25:44 -04:00
Merge remote-tracking branch 'origin/develop' into metrics
This commit is contained in:
commit
e90002ca1d
@ -133,10 +133,16 @@ class Pusher(object):
|
|||||||
)
|
)
|
||||||
continue
|
continue
|
||||||
if matches:
|
if matches:
|
||||||
logger.info("%s matches for user %s, event %s", r['rule_id'], self.user_name, ev['event_id'])
|
logger.info(
|
||||||
|
"%s matches for user %s, event %s",
|
||||||
|
r['rule_id'], self.user_name, ev['event_id']
|
||||||
|
)
|
||||||
defer.returnValue(actions)
|
defer.returnValue(actions)
|
||||||
|
|
||||||
logger.info("No rules match for user %s, event %s", self.user_name, ev['event_id'])
|
logger.info(
|
||||||
|
"No rules match for user %s, event %s",
|
||||||
|
self.user_name, ev['event_id']
|
||||||
|
)
|
||||||
defer.returnValue(Pusher.DEFAULT_ACTIONS)
|
defer.returnValue(Pusher.DEFAULT_ACTIONS)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
Loading…
Reference in New Issue
Block a user