Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit 54fef09

Browse files
anoadragon453anoadragon453
authored
Remove usage of deprecated logger.warn method from codebase (#6271)
Replace every instance of `logger.warn` with `logger.warning` as the former is deprecated.
1 parent 0467f33 commit 54fef09

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+164
-149
lines changed

‎changelog.d/6271.misc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Replace every instance of `logger.warn` method with `logger.warning` as the former is deprecated.

‎scripts/move_remote_media_to_new_store.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def move_media(origin_server, file_id, src_paths, dest_paths):
7272
# check that the original exists
7373
original_file = src_paths.remote_media_filepath(origin_server, file_id)
7474
if not os.path.exists(original_file):
75-
logger.warn(
75+
logger.warning(
7676
"Original for %s/%s (%s) does not exist",
7777
origin_server,
7878
file_id,

‎scripts/synapse_port_db‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class Store(
157157
)
158158
except self.database_engine.module.DatabaseError as e:
159159
if self.database_engine.is_deadlock(e):
160-
logger.warn("[TXN DEADLOCK] {%s} %d/%d", desc, i, N)
160+
logger.warning("[TXN DEADLOCK] {%s} %d/%d", desc, i, N)
161161
if i < N:
162162
i += 1
163163
conn.rollback()
@@ -432,7 +432,7 @@ class Porter(object):
432432
for row in rows:
433433
d = dict(zip(headers, row))
434434
if "\0" in d['value']:
435-
logger.warn('dropping search row %s', d)
435+
logger.warning('dropping search row %s', d)
436436
else:
437437
rows_dict.append(d)
438438

@@ -647,7 +647,7 @@ class Porter(object):
647647
if isinstance(col, bytes):
648648
return bytearray(col)
649649
elif isinstance(col, string_types) and "\0" in col:
650-
logger.warn(
650+
logger.warning(
651651
"DROPPING ROW: NUL value in table %s col %s: %r",
652652
table,
653653
headers[j],

‎synapse/api/auth.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ def get_appservice_by_req(self, request):
497497
token = self.get_access_token_from_request(request)
498498
service = self.store.get_app_service_by_token(token)
499499
if not service:
500-
logger.warn("Unrecognised appservice access token.")
500+
logger.warning("Unrecognised appservice access token.")
501501
raise InvalidClientTokenError()
502502
request.authenticated_entity = service.sender
503503
return defer.succeed(service)

‎synapse/app/__init__.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ def check_bind_error(e, address, bind_addresses):
4444
bind_addresses (list): Addresses on which the service listens.
4545
"""
4646
if address == "0.0.0.0" and "::" in bind_addresses:
47-
logger.warn("Failed to listen on 0.0.0.0, continuing because listening on [::]")
47+
logger.warning(
48+
"Failed to listen on 0.0.0.0, continuing because listening on [::]"
49+
)
4850
else:
4951
raise e

‎synapse/app/appservice.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def start_listening(self, listeners):
9494
)
9595
elif listener["type"] == "metrics":
9696
if not self.get_config().enable_metrics:
97-
logger.warn(
97+
logger.warning(
9898
(
9999
"Metrics listener configured, but "
100100
"enable_metrics is not True!"
@@ -103,7 +103,7 @@ def start_listening(self, listeners):
103103
else:
104104
_base.listen_metrics(listener["bind_addresses"], listener["port"])
105105
else:
106-
logger.warn("Unrecognized listener type: %s", listener["type"])
106+
logger.warning("Unrecognized listener type: %s", listener["type"])
107107

108108
self.get_tcp_replication().start_replication(self)
109109

‎synapse/app/client_reader.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def start_listening(self, listeners):
153153
)
154154
elif listener["type"] == "metrics":
155155
if not self.get_config().enable_metrics:
156-
logger.warn(
156+
logger.warning(
157157
(
158158
"Metrics listener configured, but "
159159
"enable_metrics is not True!"
@@ -162,7 +162,7 @@ def start_listening(self, listeners):
162162
else:
163163
_base.listen_metrics(listener["bind_addresses"], listener["port"])
164164
else:
165-
logger.warn("Unrecognized listener type: %s", listener["type"])
165+
logger.warning("Unrecognized listener type: %s", listener["type"])
166166

167167
self.get_tcp_replication().start_replication(self)
168168

‎synapse/app/event_creator.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def start_listening(self, listeners):
147147
)
148148
elif listener["type"] == "metrics":
149149
if not self.get_config().enable_metrics:
150-
logger.warn(
150+
logger.warning(
151151
(
152152
"Metrics listener configured, but "
153153
"enable_metrics is not True!"
@@ -156,7 +156,7 @@ def start_listening(self, listeners):
156156
else:
157157
_base.listen_metrics(listener["bind_addresses"], listener["port"])
158158
else:
159-
logger.warn("Unrecognized listener type: %s", listener["type"])
159+
logger.warning("Unrecognized listener type: %s", listener["type"])
160160

161161
self.get_tcp_replication().start_replication(self)
162162

‎synapse/app/federation_reader.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def start_listening(self, listeners):
132132
)
133133
elif listener["type"] == "metrics":
134134
if not self.get_config().enable_metrics:
135-
logger.warn(
135+
logger.warning(
136136
(
137137
"Metrics listener configured, but "
138138
"enable_metrics is not True!"
@@ -141,7 +141,7 @@ def start_listening(self, listeners):
141141
else:
142142
_base.listen_metrics(listener["bind_addresses"], listener["port"])
143143
else:
144-
logger.warn("Unrecognized listener type: %s", listener["type"])
144+
logger.warning("Unrecognized listener type: %s", listener["type"])
145145

146146
self.get_tcp_replication().start_replication(self)
147147

‎synapse/app/federation_sender.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def start_listening(self, listeners):
123123
)
124124
elif listener["type"] == "metrics":
125125
if not self.get_config().enable_metrics:
126-
logger.warn(
126+
logger.warning(
127127
(
128128
"Metrics listener configured, but "
129129
"enable_metrics is not True!"
@@ -132,7 +132,7 @@ def start_listening(self, listeners):
132132
else:
133133
_base.listen_metrics(listener["bind_addresses"], listener["port"])
134134
else:
135-
logger.warn("Unrecognized listener type: %s", listener["type"])
135+
logger.warning("Unrecognized listener type: %s", listener["type"])
136136

137137
self.get_tcp_replication().start_replication(self)
138138

0 commit comments

Comments
 (0)