Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add another @cached wrapper, this time on get_presence_state()" 

This reverts commit ff1fa0fbf8.
This commit is contained in:
Paul "LeoNerd" Evans 2015-03-27 16:16:58 +00:00
parent ff1fa0fbf8
commit 3e420aebd8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/storage/presence.py
View File

@ -13,9 +13,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from twisted.internet import defer from ._base import SQLBaseStore
from ._base import SQLBaseStore, cached
class PresenceStore(SQLBaseStore): class PresenceStore(SQLBaseStore):
@ -35,7 +33,6 @@ class PresenceStore(SQLBaseStore):
desc="has_presence_state", desc="has_presence_state",
) )
@cached()
def get_presence_state(self, user_localpart): def get_presence_state(self, user_localpart):
return self._simple_select_one( return self._simple_select_one(
table="presence", table="presence",
@ -44,9 +41,8 @@ class PresenceStore(SQLBaseStore):
desc="get_presence_state", desc="get_presence_state",
) )
@defer.inlineCallbacks
def set_presence_state(self, user_localpart, new_state): def set_presence_state(self, user_localpart, new_state):
ret = yield self._simple_update_one( return self._simple_update_one(
table="presence", table="presence",
keyvalues={"user_id": user_localpart}, keyvalues={"user_id": user_localpart},
updatevalues={"state": new_state["state"], updatevalues={"state": new_state["state"],
@ -54,8 +50,6 @@ class PresenceStore(SQLBaseStore):
"mtime": self._clock.time_msec()}, "mtime": self._clock.time_msec()},
desc="set_presence_state", desc="set_presence_state",
) )
self.get_presence_state.invalidate(user_localpart)
defer.returnValue(ret)
def allow_presence_visible(self, observed_localpart, observer_userid): def allow_presence_visible(self, observed_localpart, observer_userid):
return self._simple_insert( return self._simple_insert(