diff options
| author | Richard van der Hoff <github@rvanderhoff.org.uk> | 2017-03-23 09:29:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-23 09:29:28 +0000 |
| commit | b2d40d736359f694a7fc2f4c21e3e53b934d59d8 (patch) | |
| tree | f31d28d9d9de7eb218037277624463cd5e9d08ed | |
| parent | Merge pull request #2044 from matrix-org/rav/crypto_docs (diff) | |
| parent | Fix a couple of logcontext leaks (diff) | |
| download | synapse-b2d40d736359f694a7fc2f4c21e3e53b934d59d8.tar.xz | |
Merge pull request #2049 from matrix-org/rav/logcontext_leaks
Fix a couple of logcontext leaks
| -rw-r--r-- | synapse/api/auth.py | 5 | ||||
| -rw-r--r-- | synapse/util/retryutils.py | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 03a215ab1b..9dbc7993df 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -23,7 +23,7 @@ from synapse import event_auth from synapse.api.constants import EventTypes, Membership, JoinRules from synapse.api.errors import AuthError, Codes from synapse.types import UserID -from synapse.util.logcontext import preserve_context_over_fn +from synapse.util import logcontext from synapse.util.metrics import Measure logger = logging.getLogger(__name__) @@ -209,8 +209,7 @@ class Auth(object): default=[""] )[0] if user and access_token and ip_addr: - preserve_context_over_fn( - self.store.insert_client_ip, + logcontext.preserve_fn(self.store.insert_client_ip)( user=user, access_token=access_token, ip=ip_addr, diff --git a/synapse/util/retryutils.py b/synapse/util/retryutils.py index 153ef001ad..b68e8c4e9f 100644 --- a/synapse/util/retryutils.py +++ b/synapse/util/retryutils.py @@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +import synapse.util.logcontext from twisted.internet import defer from synapse.api.errors import CodeMessageException @@ -173,4 +173,5 @@ class RetryDestinationLimiter(object): "Failed to store set_destination_retry_timings", ) - store_retry_timings() + # we deliberately do this in the background. + synapse.util.logcontext.preserve_fn(store_retry_timings)() |