Always wrap the entire application into asyncio.run()

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/scripts/pakfire-build-service b/src/scripts/pakfire-build-service
index 7d7db2735c82460a88f92b0f3efff52b692c2fbd..159d70815a64b6f509f8959fd305b60104e66938 100644 (file)
--- a/src/scripts/pakfire-build-service
+++ b/src/scripts/pakfire-build-service
@@ -115,11 +115,9 @@ class Cli(object):
                                for pkg in job:
                                        print(pkg)
 
-
-if __name__ == "__main__":
+async def main():
        cli = Cli()
+       await cli(*sys.argv)
 
-       # Create a new event loop
-       loop = asyncio.get_event_loop()
-
-       loop.run_until_complete(cli(*sys.argv))
+if __name__ == "__main__":
+       asyncio.run(main())

diff --git a/src/scripts/pakfire-hub b/src/scripts/pakfire-hub
index df12429fc595a591a45c3306003f4ad15c446eb1..6730756de577270c8846f8f66bf3d2818b88ae1e 100644 (file)
--- a/src/scripts/pakfire-hub
+++ b/src/scripts/pakfire-hub
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import tornado.ioloop
+import asyncio
 import tornado.options
 
 import pakfire.buildservice.hub
@@ -8,7 +8,7 @@ import pakfire.buildservice.hub
 tornado.options.define("debug", type=bool, default=False, help="Enable debug mode")
 tornado.options.define("port", type=int, default=8000, help="Port to listen on")
 
-def run():
+async def main():
        tornado.options.parse_command_line()
 
        # Initialise application
@@ -19,7 +19,8 @@ def run():
                max_body_size=1073741824,
        )
 
-       # Launch IOLoop
-       tornado.ioloop.IOLoop.current().start()
+       # Wait for forever
+       await asyncio.Event().wait()
 
-run()
+if __name__ == "__main__":
+       asyncio.run(main())

diff --git a/src/scripts/pakfire-web b/src/scripts/pakfire-web
index 404644e42d5c323cef71707d48311cca292f9f33..e0ead19ea1900a9194f270f7ccc1b84da079bfaa 100644 (file)
--- a/src/scripts/pakfire-web
+++ b/src/scripts/pakfire-web
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import tornado.ioloop
+import asyncio
 import tornado.options
 
 import pakfire.buildservice.web
@@ -8,14 +8,15 @@ import pakfire.buildservice.web
 tornado.options.define("debug", type=bool, default=False, help="Enable debug mode")
 tornado.options.define("port", type=int, default=9000, help="Port to listen on")
 
-def run():
+async def main():
        tornado.options.parse_command_line()
 
        # Initialise application
        app = pakfire.buildservice.web.Application(debug=tornado.options.options.debug)
        app.listen(tornado.options.options.port, xheaders=True)
 
-       # Launch IOLoop
-       tornado.ioloop.IOLoop.current().start()
+       # Wait for forever
+       await asyncio.Event().wait()
 
-run()
+if __name__ == "__main__":
+       asyncio.run(main())