summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2017-01-05 13:50:22 +0000
committerMark Haines <mark.haines@matrix.org>2017-01-05 13:50:22 +0000
commitc18f7fc41019be6a5c08df3f4976bd94435677c7 (patch)
tree9c004496a373170c4468a38cc53e4e328f7a0b18
parentMerge pull request #1767 from matrix-org/matthew/resolve_state_group_logging (diff)
downloadsynapse-c18f7fc41019be6a5c08df3f4976bd94435677c7.tar.xz
Fix flake8 and update changelog v0.18.6-rc3
-rw-r--r--CHANGES.rst2
-rw-r--r--synapse/api/auth.py2
-rw-r--r--synapse/state.py8
3 files changed, 6 insertions, 6 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 82c8e38cc5..c1a8dd7613 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,7 +11,7 @@ Bug fixes:
 
 Changes:
 
-* Improve logging for debugging deadlocks (PR #1766)
+* Improve logging for debugging deadlocks (PR #1766, PR #1767)
 
 Changes in synapse v0.18.6-rc2 (2016-12-30)
 ===========================================
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index 641f2bb065..f93e45a744 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -290,7 +290,7 @@ class Auth(object):
         with Measure(self.clock, "check_host_in_room"):
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
 
-            logger.info("calling resolve_state_groups from check_host_in_room");
+            logger.info("calling resolve_state_groups from check_host_in_room")
             entry = yield self.state.resolve_state_groups(
                 room_id, latest_event_ids
             )
diff --git a/synapse/state.py b/synapse/state.py
index bbca59b1e8..ba0d2a39ac 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -123,7 +123,7 @@ class StateHandler(object):
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
 
-        logger.info("calling resolve_state_groups from get_current_state");
+        logger.info("calling resolve_state_groups from get_current_state")
         ret = yield self.resolve_state_groups(room_id, latest_event_ids)
         state = ret.state
 
@@ -148,7 +148,7 @@ class StateHandler(object):
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
 
-        logger.info("calling resolve_state_groups from get_current_state_ids");
+        logger.info("calling resolve_state_groups from get_current_state_ids")
         ret = yield self.resolve_state_groups(room_id, latest_event_ids)
         state = ret.state
 
@@ -160,7 +160,7 @@ class StateHandler(object):
 
     @defer.inlineCallbacks
     def get_current_user_in_room(self, room_id, latest_event_ids=None):
-        logger.info("calling resolve_state_groups from get_current_user_in_room");
+        logger.info("calling resolve_state_groups from get_current_user_in_room")
         if not latest_event_ids:
             latest_event_ids = yield self.store.get_latest_event_ids_in_room(room_id)
         entry = yield self.resolve_state_groups(room_id, latest_event_ids)
@@ -226,7 +226,7 @@ class StateHandler(object):
             context.prev_state_events = []
             defer.returnValue(context)
 
-        logger.info("calling resolve_state_groups from compute_event_context");
+        logger.info("calling resolve_state_groups from compute_event_context")
         if event.is_state():
             entry = yield self.resolve_state_groups(
                 event.room_id, [e for e, _ in event.prev_events],