diff --git a/CHANGES.rst b/CHANGES.rst
index 6779a36f7239ce08958d9ab2db46332b3fe85bff..0d36e8eeffce9cf69516e349fc5f0d56cbb33f65 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,24 @@
+Changes in synapse 0.5.4a (2014-12-13)
+======================================
+
+ * Fix bug while generating the error message when a file path specified in
+ the config doesn't exist.
+
+Changes in synapse 0.5.4 (2014-12-03)
+=====================================
+
+ * Fix presence bug where some rooms did not display presence updates for
+ remote users.
+ * Do not log SQL timing log lines when started with "-v"
+ * Fix potential memory leak.
+
+Changes in synapse 0.5.3c (2014-12-02)
+======================================
+
+ * Change the default value for the `content_addr` option to use the HTTP
+ listener, as by default the HTTPS listener will be using a self-signed
+ certificate.
+
Changes in synapse 0.5.3 (2014-11-27)
=====================================
diff --git a/VERSION b/VERSION
index dc74c5626d844ed25b2e921b99724782e45439d6..64c6e2f460ca4f28e6e42b58cc272806d8d0f6d7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.3a
+0.5.4a
diff --git a/contrib/jitsimeetbridge/unjingle/.swp b/contrib/jitsimeetbridge/unjingle/.swp
deleted file mode 100644
index 449c08da561e6bb3b4429ae8e8817bf8c07463d1..0000000000000000000000000000000000000000
Binary files a/contrib/jitsimeetbridge/unjingle/.swp and /dev/null differ
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 658574dab9ee2a278480fd977d9fdbb7795ec90d..7e49e1fd080854f4681e3f18ab200018a3160716 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
""" This is a reference implementation of a synapse home server.
"""
-__version__ = "0.5.3a"
+__version__ = "0.5.4a"
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 6870af10e88794f565d848a7a3fcef4cb3f34349..846570811f65b914d401d51f04af6b0345a27287 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -44,9 +44,9 @@ class Config(object):
)
if not os.path.exists(file_path):
raise ConfigError(
- "File % config for %s doesn't exist."
+ "File %s config for %s doesn't exist."
" Try running again with --generate-config"
- % (config_name,)
+ % (file_path, config_name,)
)
return cls.abspath(file_path)
diff --git a/synapse/config/logger.py b/synapse/config/logger.py
index 85662964332b2387f690bd814dff0ea72c7cfbab..089d906fa509c4b24c60600b3e7e71ecb50cb724 100644
--- a/synapse/config/logger.py
+++ b/synapse/config/logger.py
@@ -52,12 +52,18 @@ class LoggingConfig(Config):
if self.log_config is None:
level = logging.INFO
+ level_for_storage = logging.INFO
if self.verbosity:
level = logging.DEBUG
+ if self.verbosity > 1:
+ level_for_storage = logging.DEBUG
# FIXME: we need a logging.WARN for a -q quiet option
logger = logging.getLogger('')
logger.setLevel(level)
+
+ logging.getLogger('synapse.storage').setLevel(level_for_storage)
+
formatter = logging.Formatter(log_format)
if self.log_file:
handler = logging.FileHandler(self.log_file)
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 814a4c349b040384b1c8cb98ee2a062396494b3e..f8a0844b8ca38468c451ce37e055695152f5b376 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -35,8 +35,11 @@ class ServerConfig(Config):
if not args.content_addr:
host = args.server_name
if ':' not in host:
- host = "%s:%d" % (host, args.bind_port)
- args.content_addr = "https://%s" % (host,)
+ host = "%s:%d" % (host, args.unsecure_port)
+ else:
+ host = host.split(':')[0]
+ host = "%s:%d" % (host, args.unsecure_port)
+ args.content_addr = "http://%s" % (host,)
self.content_addr = args.content_addr
diff --git a/synapse/federation/replication.py b/synapse/federation/replication.py
index 312d69fcaa378d646088c595766b1ce6a2a46423..01f87fe423ae6f775e1c2feaa298cc2c1a22b5c5 100644
--- a/synapse/federation/replication.py
+++ b/synapse/federation/replication.py
@@ -853,7 +853,10 @@ class _TransactionQueue(object):
# Ensures we don't continue until all callbacks on that
# deferred have fired
- yield deferred
+ try:
+ yield deferred
+ except:
+ pass
logger.debug("TX [%s] Yielded to callbacks", destination)
@@ -865,7 +868,8 @@ class _TransactionQueue(object):
logger.exception(e)
for deferred in deferreds:
- deferred.errback(e)
+ if not deferred.called:
+ deferred.errback(e)
finally:
# We want to be *very* sure we delete this after we stop processing
diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index b55d589dafbae3426034ff6eb1a19d3e11b31066..815d40f1664722e707a481ac86c86c9fbce34d1c 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -651,11 +651,16 @@ class PresenceHandler(BaseHandler):
logger.debug("Incoming presence update from %s", user)
observers = set(self._remote_recvmap.get(user, set()))
+ if observers:
+ logger.debug(" | %d interested local observers %r", len(observers), observers)
rm_handler = self.homeserver.get_handlers().room_member_handler
room_ids = yield rm_handler.get_rooms_for_user(user)
+ if room_ids:
+ logger.debug(" | %d interested room IDs %r", len(room_ids), room_ids)
if not observers and not room_ids:
+ logger.debug(" | no interested observers or room IDs")
continue
state = dict(push)
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 88955160c5030b77393c4192c6e30f1ce51469df..a000b44036a8559e7ba31a93b80f0a228b51f3b7 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -519,7 +519,11 @@ class RoomMemberHandler(BaseHandler):
user_id=user.to_string(), membership_list=membership_list
)
- defer.returnValue([r.room_id for r in rooms])
+ # For some reason the list of events contains duplicates
+ # TODO(paul): work out why because I really don't think it should
+ room_ids = set(r.room_id for r in rooms)
+
+ defer.returnValue(room_ids)
@defer.inlineCallbacks
def _do_local_membership_update(self, event, membership, snapshot,
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index cc6ffb9aff1fe2d4431da7f83132dce35ff84900..3147d7a60ba3a78f5ae9e8bce6ba0abfc2a99872 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -327,7 +327,9 @@ class RoomMessageListRestServlet(RestServlet):
@defer.inlineCallbacks
def on_GET(self, request, room_id):
user = yield self.auth.get_user_by_req(request)
- pagination_config = PaginationConfig.from_request(request)
+ pagination_config = PaginationConfig.from_request(request,
+ default_limit=10,
+ )
with_feedback = "feedback" in request.args
handler = self.handlers.message_handler
msgs = yield handler.get_messages(
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index c37df59d456f75af3ac5be41f88750c4bf4a6f89..05b275663e0d3eef5ff6e516b51a7ef54389b9ba 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -218,7 +218,9 @@ class RoomMemberStore(SQLBaseStore):
"ON m.event_id = c.event_id "
"WHERE m.membership = 'join' "
"AND (%(clause)s) "
- "GROUP BY m.room_id HAVING COUNT(m.room_id) = ?"
+ # TODO(paul): We've got duplicate rows in the database somewhere
+ # so we have to DISTINCT m.user_id here
+ "GROUP BY m.room_id HAVING COUNT(DISTINCT m.user_id) = ?"
) % {"clause": user_list_clause}
args = list(user_id_list)
diff --git a/synapse/streams/config.py b/synapse/streams/config.py
index 0317e78c08273a15b92486fea96595b424fd8aa5..2114c940e747f67ab355140a1b811863c65a54fa 100644
--- a/synapse/streams/config.py
+++ b/synapse/streams/config.py
@@ -47,7 +47,8 @@ class PaginationConfig(object):
self.limit = int(limit) if limit is not None else None
@classmethod
- def from_request(cls, request, raise_invalid_params=True):
+ def from_request(cls, request, raise_invalid_params=True,
+ default_limit=None):
def get_param(name, default=None):
lst = request.args.get(name, [])
if len(lst) > 1:
@@ -84,6 +85,9 @@ class PaginationConfig(object):
if limit is not None and not limit.isdigit():
raise SynapseError(400, "'limit' parameter must be an integer.")
+ if limit is None:
+ limit = default_limit
+
try:
return PaginationConfig(from_tok, to_tok, direction, limit)
except: