Merge pull request #445 from gratipay/aspen-serve

Implement aspen.serve
AspenWeb · Jun 18, 2015 · a05500d · a05500d
2 parents 8b2809f + 9102f94
commit a05500d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/aspen/__init__.py b/aspen/__init__.py
@@ -92,3 +92,14 @@
 
 RENDERERS.sort()
 
+
+def serve(website, host='0.0.0.0', port='8080'):
+    """Serve a website.
+    """
+    import os
+    from wsgiref.simple_server import make_server
+
+    port = int(os.environ.get('PORT', port))
+    server = make_server(host, port, website)
+    log_dammit("Greetings, program! Now serving on http://{0}:{1}/.".format(host, port))
+    server.serve_forever()
diff --git a/aspen/__main__.py b/aspen/__main__.py
@@ -21,15 +21,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-import os
-from aspen import log_dammit
-from aspen.website import Website
-from wsgiref.simple_server import make_server
-
+from aspen import serve, Website
 
 if __name__ == '__main__':
     website = Website()
-    port = int(os.environ.get('PORT', '8080'))
-    server = make_server('0.0.0.0', port, website)
-    log_dammit("Greetings, program! Welcome to port {0}.".format(port))
-    server.serve_forever()
+    serve(website)