From ed12338f35c7d865171df5be5bc656d8e4bc8278 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Mon, 4 Mar 2019 14:00:03 +0000
Subject: Remove #4733 debug (#4767)

We don't need any of this stuff now; this brings protocol.py back into line
with develop for the hotfixes branch.
---
 changelog.d/4734.misc               | 1 -
 synapse/replication/tcp/protocol.py | 4 ----
 2 files changed, 5 deletions(-)
 delete mode 100644 changelog.d/4734.misc

diff --git a/changelog.d/4734.misc b/changelog.d/4734.misc
deleted file mode 100644
index f4e3aeb44f..0000000000
--- a/changelog.d/4734.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add some debug to help with #4733.
diff --git a/synapse/replication/tcp/protocol.py b/synapse/replication/tcp/protocol.py
index 530bd3756c..429471c345 100644
--- a/synapse/replication/tcp/protocol.py
+++ b/synapse/replication/tcp/protocol.py
@@ -52,7 +52,6 @@ indicate which side is sending, these are *not* included on the wire::
 import fcntl
 import logging
 import struct
-import traceback
 from collections import defaultdict
 
 from six import iteritems, iterkeys
@@ -242,7 +241,6 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
     def send_error(self, error_string, *args):
         """Send an error to remote and close the connection.
         """
-        logger.error("[%s] Sending error: %s", self.id(), error_string % args)
         self.send_command(ErrorCommand(error_string % args))
         self.close()
 
@@ -335,8 +333,6 @@ class BaseReplicationStreamProtocol(LineOnlyReceiver):
         we or the remote has closed the connection)
         """
         logger.info("[%s] Stop producing", self.id())
-        # debug for #4733
-        logger.info("Traceback: %s", "".join(traceback.format_stack()))
         self.on_connection_closed()
 
     def connectionLost(self, reason):
-- 
cgit 1.5.1