Merge pull request getpelican#958 from hrbonz/dev_server_port

Dev server port
chrisng · Jul 14, 2013 · 9f0ad2b · 9f0ad2b
2 parents 5e73b7b + 6896328
commit 9f0ad2b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/pelican/server.py b/pelican/server.py
@@ -10,7 +10,7 @@
 except ImportError:
     import socketserver  # NOQA
 
-PORT = 8000
+PORT = len(sys.argv) == 2 and int(sys.argv[1]) or 8000
 
 Handler = srvmod.SimpleHTTPRequestHandler
 
@@ -26,4 +26,4 @@
     httpd.serve_forever()
 except KeyboardInterrupt as e:
     print("shutting down server")
-    httpd.socket.close()
+    httpd.socket.close()
diff --git a/pelican/tools/templates/Makefile.in b/pelican/tools/templates/Makefile.in
@@ -28,8 +28,8 @@ help:
 	@echo '   make clean                       remove the generated files         '
 	@echo '   make regenerate                  regenerate files upon modification '
 	@echo '   make publish                     generate using production settings '
-	@echo '   make serve                       serve site at http://localhost:8000'
-	@echo '   make devserver                   start/restart develop_server.sh    '
+	@echo '   make serve [PORT=8000]           serve site at http://localhost:8000'
+	@echo '   make devserver [PORT=8000]       start/restart develop_server.sh    '
 	@echo '   make stopserver                  stop local server                  '
 	@echo '   ssh_upload                       upload the web site via SSH        '
 	@echo '   rsync_upload                     upload the web site via rsync+ssh  '
@@ -50,10 +50,18 @@ regenerate:
 	$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS)
 
 serve:
+ifdef PORT
+	cd $$(OUTPUTDIR) && $(PY) -m pelican.server $$(PORT)
+else
 	cd $$(OUTPUTDIR) && $(PY) -m pelican.server
+endif
 
 devserver:
+ifdef PORT
+	$$(BASEDIR)/develop_server.sh restart $$(PORT)
+else
 	$$(BASEDIR)/develop_server.sh restart
+endif
 
 stopserver:
 	kill -9 `cat pelican.pid`

diff --git a/pelican/tools/templates/develop_server.sh.in b/pelican/tools/templates/develop_server.sh.in
@@ -18,7 +18,7 @@ SRV_PID=$$BASEDIR/srv.pid
 PELICAN_PID=$$BASEDIR/pelican.pid
 
 function usage(){
-  echo "usage: $$0 (stop) (start) (restart)"
+  echo "usage: $$0 (stop) (start) (restart) [port]"
   echo "This starts pelican in debug and reload mode and then launches"
   echo "A pelican.server to help site development. It doesn't read"
   echo "your pelican options so you edit any paths in your Makefile"
@@ -59,13 +59,14 @@ function shut_down(){
 }
 
 function start_up(){
+  local port=$$1
   echo "Starting up Pelican and pelican.server"
   shift
   $$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS &
   pelican_pid=$$!
   echo $$pelican_pid > $$PELICAN_PID
   cd $$OUTPUTDIR
-  $PY -m pelican.server &
+  $PY -m pelican.server $$port &
   srv_pid=$$!
   echo $$srv_pid > $$SRV_PID
   cd $$BASEDIR
@@ -83,15 +84,18 @@ function start_up(){
 ###
 #  MAIN
 ###
-[[ $$# -ne 1 ]] && usage
+[[ ($$# -eq 0) || ($$# -gt 2) ]] && usage
+port=''
+[[ $$# -eq 2 ]] && port=$$2
+
 if [[ $$1 == "stop" ]]; then
   shut_down
 elif [[ $$1 == "restart" ]]; then
   shut_down
-  start_up
+  start_up $$port
 elif [[ $$1 == "start" ]]; then
-  if ! start_up; then
-    shut_down
+  if ! start_up $$port; then
+    shut_down 
   fi
 else
   usage