diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 22:38:21 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 22:38:21 -0400 |
commit | 6f4bc6d01d6eed5211021fd29ef152f96c03c357 (patch) | |
tree | 1f0a6e344096d8f40283be7c1e74be6eb45735ca /synapse/util/rlimit.py | |
parent | rename get_devices_by_remote to get_device_updates_by_remote (diff) | |
parent | Merge pull request #6254 from matrix-org/uhoreg/cross_signing_fix_workers_notify (diff) | |
download | synapse-6f4bc6d01d6eed5211021fd29ef152f96c03c357.tar.xz |
Merge branch 'develop' into cross-signing_federation
Diffstat (limited to 'synapse/util/rlimit.py')
-rw-r--r-- | synapse/util/rlimit.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/rlimit.py b/synapse/util/rlimit.py index 6c0f2bb0cf..207cd17c2a 100644 --- a/synapse/util/rlimit.py +++ b/synapse/util/rlimit.py @@ -33,4 +33,4 @@ def change_resource_limit(soft_file_no): resource.RLIMIT_CORE, (resource.RLIM_INFINITY, resource.RLIM_INFINITY) ) except (ValueError, resource.error) as e: - logger.warn("Failed to set file or core limit: %s", e) + logger.warning("Failed to set file or core limit: %s", e) |