Skip to content

Commit 1d731ec

Browse files
committed
Remove server_name changes
From #18868
1 parent c076082 commit 1d731ec

12 files changed

+13
-13
lines changed

synapse/app/admin_cmd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ def start(config: HomeServerConfig, args: argparse.Namespace) -> None:
329329
# command.
330330

331331
async def run() -> None:
332-
with LoggingContext(name="command", server_name=config.server.server_name):
332+
with LoggingContext(name="command"):
333333
await _base.start(ss)
334334
await args.func(ss, args)
335335

@@ -342,5 +342,5 @@ async def run() -> None:
342342

343343
if __name__ == "__main__":
344344
homeserver_config, args = load_config(sys.argv[1:])
345-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
345+
with LoggingContext(name="main"):
346346
start(homeserver_config, args)

synapse/app/appservice.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def main() -> None:
2929
homeserver_config = load_config(sys.argv[1:])
30-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
30+
with LoggingContext(name="main"):
3131
start(homeserver_config)
3232

3333

synapse/app/client_reader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def main() -> None:
2929
homeserver_config = load_config(sys.argv[1:])
30-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
30+
with LoggingContext(name="main"):
3131
start(homeserver_config)
3232

3333

synapse/app/event_creator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
def main() -> None:
2828
homeserver_config = load_config(sys.argv[1:])
29-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
29+
with LoggingContext(name="main"):
3030
start(homeserver_config)
3131

3232

synapse/app/federation_reader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def main() -> None:
2929
homeserver_config = load_config(sys.argv[1:])
30-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
30+
with LoggingContext(name="main"):
3131
start(homeserver_config)
3232

3333

synapse/app/federation_sender.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def main() -> None:
2929
homeserver_config = load_config(sys.argv[1:])
30-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
30+
with LoggingContext(name="main"):
3131
start(homeserver_config)
3232

3333

synapse/app/frontend_proxy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def main() -> None:
2929
homeserver_config = load_config(sys.argv[1:])
30-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
30+
with LoggingContext(name="main"):
3131
start(homeserver_config)
3232

3333

synapse/app/generic_worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ def start(config: HomeServerConfig) -> None:
379379

380380
def main() -> None:
381381
homeserver_config = load_config(sys.argv[1:])
382-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
382+
with LoggingContext(name="main"):
383383
start(homeserver_config)
384384

385385

synapse/app/media_repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def main() -> None:
2929
homeserver_config = load_config(sys.argv[1:])
30-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
30+
with LoggingContext(name="main"):
3131
start(homeserver_config)
3232

3333

synapse/app/pusher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
def main() -> None:
2929
homeserver_config = load_config(sys.argv[1:])
30-
with LoggingContext(name="main", server_name=homeserver_config.server.server_name):
30+
with LoggingContext(name="main"):
3131
start(homeserver_config)
3232

3333

0 commit comments

Comments
 (0)