Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement aspen.serve #445

Merged
merged 4 commits into from
Jun 18, 2015
Merged

Implement aspen.serve #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de8d15a
Implement aspen.serve
chadwhitacre Jun 18, 2015
1ee59a7
Fix up config layering
chadwhitacre Jun 18, 2015
79d8fbf
Back out aspen.Website; see #446
chadwhitacre Jun 18, 2015
9102f94
Clean up log message
chadwhitacre Jun 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions aspen/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
11 changes: 2 additions & 9 deletions aspen/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)