Changeset 4066

Timestamp:

02/15/09 22:21:55 (4 years ago)

Author:

gpolo

Message:

Adapted umit-scheduler to run on background

Location:

branch/NetworkInventory

Files:

• umit-scheduler (modified) (5 diffs)
• umitCore/Scheduler.py (modified) (6 diffs)

branch/NetworkInventory/umit-scheduler

@@ -1 +1 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-#
+
 # Copyright (C) 2007 Insecure.Com LLC.
 #
@@ -10 +10 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-#
+# 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -59 +59 @@
     Show help
     """
-    print _("Use:") + (" %s start|stop|cleanup <config_dir>" % __file__)
+    print _("Use:") + (" %s start|stop|cleanup <config_dir>" % sys.argv[0])
 
 
@@ -128 +128 @@
         log.debug(">>> Scheduler is stopped already, removing control file..")
         remove_controlfile()
-        
+
     log.debug(">>> Cleanup finished")
-   
+
 
 def start():
@@ -139 +139 @@
         sys.exit(0)
 
-    process = subprocess.Popen([sys.executable, Scheduler.__file__,
-                                sys.path[0], 'start', HOME_CONF])
+    from umitCore import Scheduler
+    from umitCore.BGProcess import run_on_background
 
-    pid = process.pid
+    run_on_background()
 
-    log.debug(">>> Starting Scheduler..")
-    log.debug(">>> Writing pid (%d) to %s" % (pid, RUNNING_FILE))
+    pid = os.getpid()
 
     f_run = open(RUNNING_FILE, 'w')
     f_run.write("%d" % pid)
     f_run.close()
+
+    Scheduler.main('start', sys.path[0], HOME_CONF)
 
 

branch/NetworkInventory/umitCore/Scheduler.py

@@ -8 +8 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
@@ -27 +27 @@
 import signal
 import warnings
-from os.path import join
 from ConfigParser import ConfigParser
 
@@ -58 +57 @@
     def check_for_changes(self):
         """
-        If schemas file or profiles file changed since last check, 
+        If schemas file or profiles file changed since last check,
         reparse schemas.
         """
@@ -630 +629 @@
     if running_scans:
         scans_count = len(running_scans)
-        log.debug("%d scan%s to cleanup" % (scans_count, 
+        log.debug("%d scan%s to cleanup" % (scans_count,
                                             (scans_count > 1) and 's' or ''))
 
@@ -666 +665 @@
 
 
-if __name__ == "__main__":    
-    sys.path.insert(0, sys.argv[1])
-
+def main(cmd, base_path, home_conf):
+    sys.path.insert(0, base_path)
     from umitCore.Paths import Path
-    Path.set_umit_conf(join(sys.argv[3]), True)
+    Path.set_umit_conf(home_conf, True)
 
     from umitCore.UmitLogging import file_log
@@ -680 +678 @@
 
     log = file_log(Path.sched_log)
-    
-    umitdb_ng = Path.umitdb_ng
+
+    globals().update(locals())
 
     if os.name == "posix":
         signal.signal(signal.SIGHUP, safe_shutdown)
-        
     signal.signal(signal.SIGTERM, safe_shutdown)
     signal.signal(signal.SIGINT, safe_shutdown)
 
-    cmds = { "start": start }
-
-    cmds[sys.argv[2]]()
-
+    cmds = {'start': start}
+    cmds[cmd]()
+
+if __name__ == "__main__":
+    main(*sys.argv)