summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2018-09-21 09:26:30 +0100
committerGitHub <noreply@github.com>2018-09-21 09:26:30 +0100
commitad53a5497d77d28a1a01d77945af6c6d1bee0bb1 (patch)
tree7278d1e19052d827e11b74918cba5d79fe1f74a3 /synapse
parentAlways LL ourselves if we're in a room to simplify clients (#3916) (diff)
parentAdd missing logger (diff)
downloadsynapse-ad53a5497d77d28a1a01d77945af6c6d1bee0bb1.tar.xz
Merge pull request #3927 from matrix-org/erikj/handle_background_errors
Handle exceptions thrown by background tasks
Diffstat (limited to 'synapse')
-rw-r--r--synapse/metrics/background_process_metrics.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/metrics/background_process_metrics.py b/synapse/metrics/background_process_metrics.py
index 167167be0a..173908299c 100644
--- a/synapse/metrics/background_process_metrics.py
+++ b/synapse/metrics/background_process_metrics.py
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
 import threading
 
 import six
@@ -23,6 +24,9 @@ from twisted.internet import defer
 
 from synapse.util.logcontext import LoggingContext, PreserveLoggingContext
 
+logger = logging.getLogger(__name__)
+
+
 _background_process_start_count = Counter(
     "synapse_background_process_start_count",
     "Number of background processes started",
@@ -191,6 +195,8 @@ def run_as_background_process(desc, func, *args, **kwargs):
 
             try:
                 yield func(*args, **kwargs)
+            except Exception:
+                logger.exception("Background process '%s' threw an exception", desc)
             finally:
                 proc.update_metrics()