Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

95582367

Unverified Commit 95582367 authored 6 years ago by Richard van der Hoff Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #3127 from matrix-org/rav/deferred_timeout

Use deferred.addTimeout instead of time_bound_deferred

parents d2737c1f 61463323

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

synapse/http/__init__.py 22 additions, 0 deletions

synapse/http/__init__.py
synapse/http/client.py 9 additions, 11 deletions

synapse/http/client.py
synapse/http/matrixfederationclient.py 20 additions, 18 deletions

synapse/http/matrixfederationclient.py
synapse/notifier.py 17 additions, 12 deletions

synapse/notifier.py
synapse/util/__init__.py 0 additions, 56 deletions

synapse/util/__init__.py
synapse/util/async.py 67 additions, 0 deletions

synapse/util/async.py
tests/util/test_clock.py 0 additions, 33 deletions

tests/util/test_clock.py

with 135 additions and 130 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment