Added patch for apscheduler

vFense · Mar 4, 2014 · 96e6f2f · 96e6f2f
1 parent 404a0d5
commit 96e6f2f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 8 deletions.
diff --git a/conf/patches/scheduler.patch b/conf/patches/scheduler.patch
@@ -0,0 +1,26 @@
+--- /usr/local/lib/python2.7/dist-packages/apscheduler/scheduler.py	2014-03-04 13:21:25.860390442 -0800
++++ mod_scheduler.py	2014-03-04 13:20:42.180389130 -0800
+@@ -406,7 +406,7 @@
+             return func
+         return inner
+
+-    def get_jobs(self):
++    def get_jobs(self, alias=None):
+         """
+         Returns a list of all scheduled jobs.
+
+@@ -415,8 +415,12 @@
+         self._jobstores_lock.acquire()
+         try:
+             jobs = []
+-            for jobstore in itervalues(self._jobstores):
+-                jobs.extend(jobstore.jobs)
++            if not alias:
++            	for jobstore in itervalues(self._jobstores):
++                    jobs.extend(jobstore.jobs)
++            else:
++                if alias in self._jobstores:
++                    jobs.extend(self._jobstores[alias].jobs)
+             return jobs
+         finally:
+             self._jobstores_lock.release()
diff --git a/tp/src/daemon/vFense b/tp/src/daemon/vFense
@@ -1,26 +1,24 @@
 #! /bin/sh
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
 NAME=vFense
 DESC=vFense
-TOPPATCHDIR=/opt/TopPatch
-DAEMON=/opt/TopPatch/tp/src/daemon/vFensed
-USER=toppatch
+DAEMON="/opt/TopPatch/tp/src/daemon/vFensed"
 
 set -e
 
 case "$1" in
   start)
-	sudo -u ${USER} sh -c "$DAEMON $1"
+	sh -c "$DAEMON $1"
         ;;
   stop)
-	sudo -u ${USER} sh -c "$DAEMON $1"
+	sh -c "$DAEMON $1"
 	;;	
   restart)
-	sudo -u ${USER} sh -c "$DAEMON $1"
+	sh -c "$DAEMON $1"
 	;;
   status)
-	sudo -u ${USER} sh -c "cd $TOPPATCHDIR;. bin/activate_toppatch;$DAEMON $1"
+	sh -c "$DAEMON $1"
 	;;
   *)
     N=/etc/init.d/$NAME

diff --git a/tp/src/scripts/initialize_vFense.py b/tp/src/scripts/initialize_vFense.py
@@ -159,6 +159,14 @@ def initialize_db():
                 'defaults'
             ],
         )
+    if os.path.exists('/usr/local/lib/python2.7/dist-packages/apscheduler/scheduler.py'):
+        subprocess.Popen(
+            [
+                'patch', '-N',
+                '/usr/local/lib/python2.7/dist-packages/apscheduler/scheduler.py',
+                '<', 'scheduler.patch'
+            ],
+        )
     try:
         tp_exists = pwd.getpwnam('toppatch')