add ensure_inited command to sbin/rsted

anru · anru · commit f00e995645e3 · 2013-06-12T11:27:04.000+07:00
also add flup to pip-requirements
diff --git a/application.py b/application.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
 # all the imports
 
 import os, sys
diff --git a/pip-requirements.txt b/pip-requirements.txt
@@ -1,3 +1,4 @@
+flup
 flask
 redis
 rst2pdf
diff --git a/pwl/fastcgi.py b/pwl/fastcgi.py
@@ -123,7 +123,7 @@ def runfastcgi(argset=[], **kwargs):
         import flup
     except ImportError, e:
         print >> sys.stderr, 'ERROR: %s' % e
-        print >> sys.stderr, '  Unable to load the flup package.  In order to run pyzzle'
+        print >> sys.stderr, '  Unable to load the flup package.  In order to run rsted'
         print >> sys.stderr, '  as a FastCGI application, you will need to get flup from'
         print >> sys.stderr, "  http://www.saddi.com/software/flup/   If you've already"
         print >> sys.stderr, '  installed flup, then make sure you have it in your PYTHONPATH.'
diff --git a/rsted.fcgi b/rsted.fcgi
@@ -5,17 +5,17 @@ from os.path import join as J
 from pwl.fastcgi import runfastcgi
 from application import app
 
-run_path = J(app.config.root_path, 'var/run')
+full_run_path = J(app.config.root_path, app.config.get('RUN_PATH', 'var/run'))
 
-if not os.path.isdir(run_path):
-    os.mkdir(run_path)
+if not os.path.isdir(full_run_path):
+    os.mkdir(full_run_path)
 
 # default options
 fcgi_opts = {
     'daemonize': 'yes',
-    'pidfile': os.path.join(run_path, 'fastcgi.pid'),
+    'pidfile': os.path.join(full_run_path, app.config.get('PID_FILE', 'fastcgi.pid')),
     'method': 'prefork',
-    'socket': os.path.join(run_path, 'rsted.sock'),
+    'socket': os.path.join(full_run_path, app.config.get('SOCKET_FILE', 'rsted.sock')),
     'workdir': app.config.root_path,
     'maxrequests': 100,
 }
diff --git a/sbin/rsted b/sbin/rsted
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python
 
 import os, sys
 from os.path import join as J
@@ -11,7 +11,7 @@ sys.path.insert(0, root_path)
 from pwl.utils.daemon import BaseDaemon
 from application import app
 
-run_path = J(app.config.root_path, 'var/run')
+run_path = J(app.config.root_path, app.config.get('RUN_PATH', 'var/run'))
 
 try:
     action = sys.argv[1]
@@ -23,7 +23,7 @@ class RstedDaemon(BaseDaemon):
     NO_WRITE_PID = True
     
     def run(self):
-        os.system(J(app.config.root_path, 'rsted.fcgi'))
+        os.system('python ' + J(app.config.root_path, 'rsted.fcgi'))
     
     def print_status(self):
         pidexists = os.path.exists(self.pidfile)
@@ -33,7 +33,26 @@ class RstedDaemon(BaseDaemon):
             count = int(os.popen("ps --pid %d --no-heading| wc -l" % pid).read().strip())
             running = count > 0
             print "Running: %s" % ('Yes' if running else 'No')
-        
+
+    def is_running(self):
+        pidexists = os.path.exists(self.pidfile)
+        if pidexists:
+            pid = self.readpid()
+            count = int(os.popen("ps --pid %d --no-heading| wc -l" % pid).read().strip())
+            return count > 0
+        return False
+
+    def ensure_started(self):
+        if not self.is_running():
+            self.delpid()
+            self.start()
+
+            chmod_socket = app.config.get('CHMOD_SOCKET')
+            socket_file = os.path.join(run_path, app.config.get('SOCKET_FILE', 'rsted.sock'))
+
+            if chmod_socket:
+                chmod_socket = str(chmod_socket)
+                os.popen("chmod %s %s" % (chmod_socket, socket_file))
 
 pidfile = J(run_path, 'fastcgi.pid')
 daemon = RstedDaemon(pidfile)
@@ -46,6 +65,10 @@ elif action == 'restart':
     daemon.restart()
 elif action == 'status':
     daemon.print_status()
-
+elif action == 'check':
+    if not daemon.is_running():
+        sys.exit(1)
+elif action == 'ensure_started':
+    daemon.ensure_started()
 
     
diff --git a/settings.py b/settings.py
@@ -2,6 +2,11 @@
 # configuration
 DEBUG = True
 
+RUN_PATH = 'var/run'
+PID_FILE = 'fastcgi.pid'
+SOCKET_FILE = 'rsted.sock'
+CHMOD_SOCKET = '0777' # you can override this in settings_local.py if you wish
+
 try:
     from settings_local import *
 except ImportError:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/usr/bin/env python2`
	`1`	`+#!/usr/bin/python`
`2`	`2`	`# all the imports`
`3`	`3`
`4`	`4`	`import os, sys`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+flup`
`1`	`2`	`flask`
`2`	`3`	`redis`
`3`	`4`	`rst2pdf`