summary refs log tree commit diff
path: root/synapse/http
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2014-12-10 00:12:51 +0000
committerMatthew Hodgson <matthew@matrix.org>2014-12-10 00:12:51 +0000
commitfaf12b64f81627d92cb1ac49b6eb58f9d3f4837d (patch)
treeed73f40921f32c5986975172fe4202ade9f9a35c /synapse/http
parentsquidge to 79 columns as per pep8 (diff)
downloadsynapse-faf12b64f81627d92cb1ac49b6eb58f9d3f4837d.tar.xz
add errbacks to enqueue_pdu deferreds; change logging for failed federation sends to warn rather than exception
Diffstat (limited to 'synapse/http')
-rw-r--r--synapse/http/matrixfederationclient.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index c76990904d..8fc6bf8f97 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -134,7 +134,7 @@ class MatrixFederationHttpClient(object):
                                 e)
                     raise SynapseError(400, "Domain specified not found.")
 
-                logger.exception("Sending request failed to %s: %s %s : %s",
+                logger.warn("Sending request failed to %s: %s %s : %s",
                                  destination, method, url_bytes, e)
                 _print_ex(e)
 
@@ -289,7 +289,7 @@ def _print_ex(e):
         for ex in e.reasons:
             _print_ex(ex)
     else:
-        logger.exception(e)
+        logger.warn(e)
 
 
 class _JsonProducer(object):