weeheavy/pelican-theme
1
0
Fork 0
forked from github/pelican
Code Pull requests Activity

Merge pull request #2397 from oulenz/pelican_server

Browse source 
Fix pelican.server __main__ code, add deprecation warning
This commit is contained in:
Justin Mayer 2018-08-08 18:08:48 +02:00 • committed by GitHub
commit 8f68551454
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pelican/server.py
View file

@ -35,7 +35,7 @@ def parse_arguments():
parser.add_argument('--key', default="./key.pem", nargs="?",
help='Path to certificate key file. ' +
'Relative to current directory')
parser.add_argument('path', default=".",
parser.add_argument('--path', default=".",
help='Path to pelican source directory to serve. ' +
'Relative to current directory')
return parser.parse_args()
@ -115,12 +115,16 @@ class RootedHTTPServer(BaseHTTPServer.HTTPServer):
if __name__ == '__main__':
logging.warning("'python -m pelican.server' is deprecated. The "
"Pelican development server should be run via "
"'pelican --listen' or 'pelican -l' (this can be combined "
"with regeneration as 'pelican -lr'). Rerun 'pelican-"
"quickstart' to get new Makefile and tasks.py files.")
args = parse_arguments()
RootedHTTPServer.allow_reuse_address = True
try:
httpd = RootedHTTPServer(
(args.server, args.port),
ComplexHTTPRequestHandler)
args.path, (args.server, args.port), ComplexHTTPRequestHandler)
if args.ssl:
httpd.socket = ssl.wrap_socket(
httpd.socket, keyfile=args.key,
@ -131,11 +135,6 @@ if __name__ == '__main__':
logging.error("Could not listen on port %s, server %s.",
args.port, args.server)
sys.exit(getattr(e, 'exitcode', 1))
except TypeError as e:
logging.error("'python -m pelican.server' is deprecated. The " +
"Pelican development server should be run via " +
"'pelican --listen'")
sys.exit(getattr(e, 'exitcode', 1))
logging.info("Serving at port %s, server %s.",
args.port, args.server)