Refactor entry points so that they all have a main function. (#13052)

matrix-org · Jun 14, 2022 · 5b645ae · 5b645ae
1 parent c99b511
commit 5b645ae
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 10 deletions.
diff --git a/changelog.d/13052.misc b/changelog.d/13052.misc
@@ -0,0 +1 @@
+Refactor entry points so that they all have a `main` function.
diff --git a/synapse/app/appservice.py b/synapse/app/appservice.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/event_creator.py b/synapse/app/event_creator.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/federation_sender.py b/synapse/app/federation_sender.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/synchrotron.py b/synapse/app/synchrotron.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/synapse/app/user_dir.py b/synapse/app/user_dir.py
@@ -17,6 +17,11 @@
 from synapse.app.generic_worker import start
 from synapse.util.logcontext import LoggingContext
 
-if __name__ == "__main__":
+
+def main() -> None:
     with LoggingContext("main"):
         start(sys.argv[1:])
+
+
+if __name__ == "__main__":
+    main()