diff options
| author | David Baker <dave@matrix.org> | 2016-01-04 14:05:37 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2016-01-04 14:05:37 +0000 |
| commit | c914d67cda9682331639b78190db367974e4fb8b (patch) | |
| tree | f0e72e559a381512d56c5027bcfeef19e80f8859 /synapse/push | |
| parent | Merge remote-tracking branch 'origin/develop' into store_event_actions (diff) | |
| download | synapse-c914d67cda9682331639b78190db367974e4fb8b.tar.xz | |
Rename event-actions to event_push_actions as per PR request
Diffstat (limited to 'synapse/push')
| -rw-r--r-- | synapse/push/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/push/action_generator.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/push/__init__.py b/synapse/push/__init__.py index 250f22a168..3ab6da0625 100644 --- a/synapse/push/__init__.py +++ b/synapse/push/__init__.py @@ -27,7 +27,7 @@ import random logger = logging.getLogger(__name__) -# Pushers could now be moved to pull out of the event_actions table instead +# Pushers could now be moved to pull out of the event_push_actions table instead # of listening on the event stream: this would avoid them having to run the # rules again. class Pusher(object): diff --git a/synapse/push/action_generator.py b/synapse/push/action_generator.py index 4ab5d9e1b8..5526324a6d 100644 --- a/synapse/push/action_generator.py +++ b/synapse/push/action_generator.py @@ -40,7 +40,7 @@ class ActionGenerator: actions_by_user = bulk_evaluator.action_for_event_by_user(event) - yield self.store.set_actions_for_event_and_users( + yield self.store.set_push_actions_for_event_and_users( event, [ (uid, None, actions) for uid, actions in actions_by_user.items() |