tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Merge branch 'replication_split' of github.com:matrix-org/synapse into rejections

Browse source 
Conflicts:
	synapse/storage/schema/delta/v12.sql
This commit is contained in:
Erik Johnston 2015-01-30 14:19:49 +00:00
commit c515d37797
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
setup.py
View file

@ -33,7 +33,7 @@ setup(
install_requires=[ install_requires=[
"syutil==0.0.2", "syutil==0.0.2",
"matrix_angular_sdk==0.6.0", "matrix_angular_sdk==0.6.0",
"Twisted>=14.0.0", "Twisted==14.0.2",
"service_identity>=1.0.0", "service_identity>=1.0.0",
"pyopenssl>=0.14", "pyopenssl>=0.14",
"pyyaml", "pyyaml",

2
synapse/python_dependencies.py
View file

@ -6,7 +6,7 @@ logger = logging.getLogger(__name__)
REQUIREMENTS = { REQUIREMENTS = {
"syutil==0.0.2": ["syutil"], "syutil==0.0.2": ["syutil"],
"matrix_angular_sdk==0.6.0": ["syweb>=0.6.0"], "matrix_angular_sdk==0.6.0": ["syweb>=0.6.0"],
"Twisted>=14.0.0": ["twisted>=14.0.0"], "Twisted==14.0.2": ["twisted==14.0.2"],
"service_identity>=1.0.0": ["service_identity>=1.0.0"], "service_identity>=1.0.0": ["service_identity>=1.0.0"],
"pyopenssl>=0.14": ["OpenSSL>=0.14"], "pyopenssl>=0.14": ["OpenSSL>=0.14"],
"pyyaml": ["yaml"], "pyyaml": ["yaml"],

8
synapse/state.py
View file

@ -37,13 +37,15 @@ def _get_state_key_from_event(event):
KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key")) KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
AuthEventTypes = (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,)
class StateHandler(object): class StateHandler(object):
""" Responsible for doing state conflict resolution. """ Responsible for doing state conflict resolution.
""" """
def __init__(self, hs): def __init__(self, hs):
self.store = hs.get_datastore() self.store = hs.get_datastore()
# self.auth = hs.get_auth()
self.hs = hs self.hs = hs
@defer.inlineCallbacks @defer.inlineCallbacks
@ -231,7 +233,7 @@ class StateHandler(object):
auth_events = { auth_events = {
k: e for k, e in unconflicted_state.items() k: e for k, e in unconflicted_state.items()
if k[0] in (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,) if k[0] in AuthEventTypes
} }
try: try:
@ -317,4 +319,4 @@ class StateHandler(object):
def key_func(e): def key_func(e):
return -int(e.depth), hashlib.sha1(e.event_id).hexdigest() return -int(e.depth), hashlib.sha1(e.event_id).hexdigest()
return sorted(events, key=key_func) return sorted(events, key=key_func)

5
synapse/storage/schema/delta/v12.sql
View file

@ -1,8 +1,4 @@
<<<<<<< HEAD
/* Copyright 2015 OpenMarket Ltd /* Copyright 2015 OpenMarket Ltd
=======
/* Copyright 2014 OpenMarket Ltd
>>>>>>> fc946f3b8da8c7f71a9c25bf542c04472147bc5b
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -57,4 +53,3 @@ CREATE TABLE IF NOT EXISTS push_rules (
); );
CREATE INDEX IF NOT EXISTS push_rules_user_name on push_rules (user_name); CREATE INDEX IF NOT EXISTS push_rules_user_name on push_rules (user_name);