Merge lp:~jelmer/loggerhead/main into lp:loggerhead

[Jelmer Vernooij]

Add support for 'python -m loggerhead'

Add support for 'python -m loggerhead'

[Colin Watson (cjwatson)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

A commit message must be set
https://jenkins.ols.canonical.com/online-services/job/loggerhead/49/

=== modified file '__init__.py'
--- __init__.py	2022-09-16 15:45:12 +0000
+++ __init__.py	2023-01-31 20:43:22 +0000
@@ -67,12 +67,12 @@
         from .loggerhead.apps.http_head import HeadMiddleware
         from .loggerhead.apps.transport import BranchesFromTransportRoot
         from .loggerhead.config import LoggerheadConfig
-        from .loggerhead.main import setup_logging
+        from .loggerhead.__main__ import setup_logging
     except ImportError:
         from loggerhead.apps.http_head import HeadMiddleware
         from loggerhead.apps.transport import BranchesFromTransportRoot
         from loggerhead.config import LoggerheadConfig
-        from loggerhead.main import setup_logging
+        from loggerhead.__main__ import setup_logging
 
     if host is None:
         host = DEFAULT_HOST

=== modified file 'loggerhead-serve'
--- loggerhead-serve	2020-06-04 20:28:15 +0000
+++ loggerhead-serve	2023-01-31 20:43:22 +0000
@@ -20,7 +20,7 @@
 
 import sys
 
-from loggerhead.main import main
+from loggerhead.__main__ import main
 
 
 if __name__ == "__main__":

=== renamed file 'loggerhead/main.py' => 'loggerhead/__main__.py'
--- loggerhead/main.py	2022-08-08 16:33:50 +0000
+++ loggerhead/__main__.py	2023-01-31 20:43:22 +0000
@@ -185,3 +185,7 @@
             print('Unknown protocol: %s.' % (protocol))
             sys.exit(1)
         WSGIServer(app, bindAddress=(host, int(port))).run()
+
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv[1:]))