diff options
author | Erik Johnston <erik@matrix.org> | 2015-08-05 16:45:56 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-08-05 16:45:56 +0100 |
commit | 3e1b77efc2fe4ef952a3914e01176ec2f283ca89 (patch) | |
tree | 270134b419c3d9c3caea0a95660c0af91a0ea550 /synapse/storage/push_rule.py | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dictionary... (diff) | |
parent | Add support for using keyword arguments with cached functions (diff) | |
download | synapse-3e1b77efc2fe4ef952a3914e01176ec2f283ca89.tar.xz |
Merge branch 'erikj/cached_keyword_args' of github.com:matrix-org/synapse into erikj/dictionary_cache
Diffstat (limited to 'synapse/storage/push_rule.py')
-rw-r--r-- | synapse/storage/push_rule.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/storage/push_rule.py b/synapse/storage/push_rule.py index 4cac118d17..a220f3632e 100644 --- a/synapse/storage/push_rule.py +++ b/synapse/storage/push_rule.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ._base import SQLBaseStore, cached +from ._base import SQLBaseStore, cachedInlineCallbacks from twisted.internet import defer import logging @@ -23,8 +23,7 @@ logger = logging.getLogger(__name__) class PushRuleStore(SQLBaseStore): - @cached() - @defer.inlineCallbacks + @cachedInlineCallbacks() def get_push_rules_for_user(self, user_name): rows = yield self._simple_select_list( table=PushRuleTable.table_name, @@ -41,8 +40,7 @@ class PushRuleStore(SQLBaseStore): defer.returnValue(rows) - @cached() - @defer.inlineCallbacks + @cachedInlineCallbacks() def get_push_rules_enabled_for_user(self, user_name): results = yield self._simple_select_list( table=PushRuleEnableTable.table_name, |