mirror of
https://github.com/element-hq/synapse.git
synced 2024-11-25 19:15:51 +03:00
Merge pull request #3927 from matrix-org/erikj/handle_background_errors
Handle exceptions thrown by background tasks
This commit is contained in:
commit
ad53a5497d
2 changed files with 7 additions and 0 deletions
1
changelog.d/3927.misc
Normal file
1
changelog.d/3927.misc
Normal file
|
@ -0,0 +1 @@
|
|||
Log exceptions thrown by background tasks
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Reference in a new issue