mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-14 11:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

More merging

Browse source
This commit is contained in:
Mark Haines 2016-04-21 16:25:19 +01:00
parent 0d5622b088
commit 3a676b8ee3
2 changed files with 1 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
synapse/app/pusher.py
View file

@ -23,7 +23,6 @@ from synapse.config.database import DatabaseConfig
from synapse.config.logger import LoggingConfig
from synapse.replication.slave.storage.events import SlavedEventStore
from synapse.replication.slave.storage.pushers import SlavedPusherStore
from synapse.replication.slave.storage.event_push_actions import SlavedPushActionsStore
from synapse.replication.slave.storage.receipts import SlavedReceiptsStore
from synapse.storage.engines import create_engine
from synapse.storage import DataStore
@ -60,9 +59,7 @@ class PusherSlaveConfig(SlaveConfig, LoggingConfig):
class PusherSlaveStore(
SlavedPushActionsStore,
SlavedEventStore, SlavedPusherStore,
SlavedReceiptsStore
SlavedEventStore, SlavedPusherStore, SlavedReceiptsStore
):
update_pusher_last_stream_ordering_and_success = (
DataStore.update_pusher_last_stream_ordering_and_success.__func__

51
synapse/replication/slave/storage/event_push_actions.py
View file

@ -1,51 +0,0 @@
# -*- coding: utf-8 -*-
# Copyright 2016 OpenMarket Ltd
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
from .events import SlavedEventStore
from .receipts import SlavedReceiptsStore
from synapse.storage import DataStore
from synapse.storage.event_push_actions import EventPushActionsStore
class SlavedPushActionsStore(SlavedEventStore, SlavedReceiptsStore):
get_unread_event_push_actions_by_room_for_user = (
EventPushActionsStore.__dict__["get_unread_event_push_actions_by_room_for_user"]
)
get_unread_push_actions_for_user_in_range = (
DataStore.get_unread_push_actions_for_user_in_range.__func__
)
get_push_action_users_in_range = (
DataStore.get_push_action_users_in_range.__func__
)
def invalidate_caches_for_event(self, event, backfilled, reset_state):
self.get_unread_event_push_actions_by_room_for_user.invalidate_many(
(event.room_id,)
)
super(SlavedPushActionsStore, self).invalidate_caches_for_event(
event, backfilled, reset_state
)
def invalidate_caches_for_receipt(self, room_id, receipt_type, user_id):
self.get_unread_event_push_actions_by_room_for_user.invalidate_many(
(room_id,)
)
super(SlavedPushActionsStore, self).invalidate_caches_for_receipt(
room_id, receipt_type, user_id
)