Changeset 772

Timestamp:

06/05/07 20:05:26 (6 years ago)

Author:

ggpolo

Message:

Added a python script to control start/stop multiplatform for Scheduler. Changed setup.py, BasePaths?.py and Paths.py to use directory share/scripts to hold this control script. You can start/stop Scheduler from GUI right now.

Location:

branch/ggpolo

Files:

• config/scheduler-schemas.conf (added)
• config/umit.conf (modified) (1 diff)
• setup.py (modified) (4 diffs)
• share/scripts (added)
• share/scripts/scheduler_control.py (added)
• umitCore/BasePaths.py (modified) (2 diffs)
• umitCore/Paths.py (modified) (5 diffs)
• umitCore/Scheduler.py (modified) (5 diffs)
• umitCore/SendMail.py (modified) (1 diff)
• umitGUI/MainWindow.py (modified) (4 diffs)

branch/ggpolo/config/umit.conf

@@ -21 +21 @@
 config_dir = config
 docs_dir = docs
+scripts_dir = share/scripts
 
 [search]

branch/ggpolo/setup.py

@@ -64 +64 @@
 sql_dir = os.path.join('share', 'umit', 'sql')
 maemo_dir = os.path.join("maemo")
+scripts_dir = os.path.join('share', 'umit', 'scripts')
 
 dist_config_dir = os.path.join('dist', config_dir)
@@ -151 +152 @@
                 [os.path.join('config', 'tl.conf')] +
                 [os.path.join('config', 'tl_colors_evt_std.conf')] +
+                [os.path.join('config', 'scheduler-schemas.conf')] +
                 glob(os.path.join('config', '*.xml'))+
                 glob(os.path.join('config', '*.txt'))),
@@ -156 +158 @@
                # UmitDB sql
                (sql_dir, glob(os.path.join("umitDB/sql", '*.sql'))),
+
+               # Scheduler script
+               (scripts_dir, [os.path.join('share', 'scripts', 
+                                           'scheduler_control.py')]),
 
                (misc_dir, glob(os.path.join('misc', '*.dmp'))), 
@@ -254 +260 @@
         parser.set(sec, "pixmaps_dir", os.path.join(self.install_data, 
                                                     pixmaps_dir))
+        parser.set(sec, "scripts_dir", os.path.join(self.install_data,
+                                                    scripts_dir)),
         parser.set(sec, "icons_dir", os.path.join(self.install_data, icons_dir))
         parser.set(sec, "locale_dir", os.path.join(self.install_data, 

branch/ggpolo/umitCore/BasePaths.py

@@ -48 +48 @@
                   umit_opt = 'umit.opt',
                   pixmaps_dir = os.path.join('share', 'pixmaps'),
+                  scripts_dir = os.path.join('share', 'scripts'),
                   i18n_dir = os.path.join('share','locale'),
                   i18n_message_file = 'umit.mo',
@@ -66 +67 @@
                   tl_conf = "tl.conf",
                   tl_colors_std = "tl_colors_evt_std.conf",
+                  
+                  # scheduler
+                  sched_schemas = "scheduler-schemas.conf",
+                  sched_control = "scheduler_control.py",
 
                   services = "nmap-services",

branch/ggpolo/umitCore/Paths.py

@@ -39 +39 @@
                         "config_dir",
                         "misc_dir",
-                        "docs_dir"]
+                        "docs_dir",
+                        "scripts_dir"]
+   
+    scripts_files_list = ["sched_control"]
     
     config_files_list = ["config_file",
@@ -52 +55 @@
                          "tl_conf",
                          "tl_colors_std",
+                         "sched_schemas",
                          "umit_version"]
     
@@ -61 +65 @@
     misc_files_list = ["services_dump",
                        "os_dump",
-                       "os_classification"]
+                       "os_classification",
+                       "sched_running"]
     
     other_settings = ["nmap_command_path"]
@@ -125 +130 @@
                 return return_if_exists(os.path.join(self.config_parser.get(self.paths_section, "misc_dir"),
                                                      base_paths[name]))
-        
+            elif name in self.scripts_files_list:
+                return return_if_exists(os.path.join(self.config_parser.get(self.paths_section, "scripts_dir"), base_paths[name]))
+
             try:
                 return self.__dict__[name]
@@ -172 +179 @@
     copy_config_file("tl.conf", main_dir, user_dir)
     copy_config_file("tl_colors_evt_std.conf", main_dir, user_dir)
+    copy_config_file("scheduler-schemas.conf", main_dir, user_dir)
     copy_config_file("wizard.xml", main_dir, user_dir)
 

branch/ggpolo/umitCore/Scheduler.py

@@ -33 +33 @@
 from umitCore.SendMail import send_mail
 from umitCore.Paths import Path
+from umitCore.BasePaths import base_paths
 from umitDB.xmlstore import XMLStore
 
@@ -39 +40 @@
     umitdb_ng = Path.umitdb_ng
 except:
-    from umitCore.Paths import Path
     Path.set_umit_conf(join(split(__file__)[0], 'config', 'umit.conf'))
 
@@ -391 +391 @@
 running_scans = { }
 
-def stop():
-    """
-    Clean temp files used by running scans.
-    """    
-    for running, opts in running_scans.items():
-        print "Cleaning up scan \"%s\"" % opts[3]
-        scan = opts[0]
-        scan.close() # delete temporary files
-        
-
-def run(schema_file=None):
+def start(schema_file=None):
     """
     Run scheduler forever.
     """
     if not schema_file:
-        print "Get file from umitCore.Path"
-        print "Not working yet"
-        sys.exit(0)
+        schema_file = Path.sched_schemas
 
     next_time = calc_next_time()
 
     s = Scheduler(schema_file)
-
+    
     scount = 0
     while 1: # run forever and ever ;)
@@ -419 +407 @@
 
         if current_time < next_time:
-           time.sleep(next_time - current_time + .1)
+            time.sleep(next_time - current_time + .1)
 
         # check if time has changed by more than two minutes (clock changes)
@@ -475 +463 @@
                 scount -= 1
                 del running_scans[running]
-
+            
         next_time += 60
 
+def stop():
+    """
+    Stop Scheduler.
+    """
+    #try:
+    #    os.remove(os.path.split(Path.config_file)[0] + "/schedrunning")
+    #except OSError, e: # scheduler wasnt running probably.
+    #    print e
+    #    sys.exit(0)
+    
+    for running, opts in running_scans.items():
+        print "Cleaning up scan \"%s\"" % opts[3]
+        scan = opts[0]
+        scan.close() # delete temporary files
 
 if __name__ == "__main__":
-    try:
-        run('schema-sample.conf')
-    except KeyboardInterrupt:
-        stop()
-
+    cmds = {"start":start(),
+            "stop":stop()
+           }
+    cmds[sys.argv[1]]

branch/ggpolo/umitCore/SendMail.py

@@ -27 +27 @@
 
 def send_mail(mail_from, mail_to, subject, text, f_attach, server="localhost",
-              authrequired=0, user='', password=''):
+              authrequired=False, user='', password=''):
     """
     Send email with attachment.

branch/ggpolo/umitGUI/MainWindow.py

@@ -52 +52 @@
 from umitDB.xmlstore import XMLStore
 from umitInventory.viewer import InvViewer
+import umitCore.Scheduler as Scheduler
+import subprocess
 
 root = False
@@ -261 +263 @@
             ),
 
+            # Scan Scheduler
+            ('Scheduler', None, _('_Scheduler'), None),
+            
+            ('Sched Status', None, _('Scheduler S_tatus'), 
+             None, _("View Scheduler Status"),
+             self._view_schedstat),
+            
             # Top Level
             ('Help', None, _('_Help'), None),
@@ -312 +321 @@
             <menuitem action='Compare Results'/>
             <menuitem action='Search Scan'/>
+            <menu action='Scheduler'>
+                <menuitem action='Sched Status' />
+            </menu>
             <menu action='Inventory'>
                 <menuitem action='Add Scan Inv'/>
@@ -353 +365 @@
         self.ui_manager.insert_action_group(self.main_action_group, 0)
         self.ui_manager.add_ui_from_string(self.default_ui)
+
+    def _view_schedstat(self, action):
+        """
+        View scheduler status and change its status if requested.
+        """
+        controller = Path.sched_control
+        try:
+            open(os.path.split(Path.config_file)[0] + "/schedrunning", 'r')
+            
+            cmd_button_text = _("Stop Scheduler")
+            status_text = _("running")
+            start = False
+        except IOError:
+            cmd_button_text = _("Run Scheduler")
+            status_text = _("stopped")
+            start = True
+        
+        # Show dialog
+        dlg = HIGDialog(buttons=(cmd_button_text, gtk.RESPONSE_CLOSE,
+                                 gtk.STOCK_OK, gtk.RESPONSE_OK))
+            
+        alert = HIGEntryLabel("<b>%s</b>" % _("Scheduler Status"))
+            
+        text = HIGEntryLabel(_('Scheduler is %s!' % status_text))
+        hbox = HIGHBox()
+        hbox.set_border_width(5)
+        hbox.set_spacing(12)
+            
+        vbox = HIGVBox()
+        vbox.set_border_width(5)
+        vbox.set_spacing(12)
+        
+        if start:
+            image = gtk.Image()
+            image.set_from_stock(gtk.STOCK_DIALOG_WARNING, gtk.ICON_SIZE_DIALOG)
+            hbox.pack_start(image)
+        
+        vbox.pack_start(alert)
+        vbox.pack_start(text)        
+        hbox.pack_start(vbox)
+            
+        dlg.vbox.pack_start(hbox)
+        dlg.vbox.show_all()
+            
+        response = dlg.run()
+        dlg.destroy()
+            
+        if response == gtk.RESPONSE_CLOSE:
+            if start:
+                subprocess.Popen([sys.executable, controller, 'start'])
+            else:
+                subprocess.Popen([sys.executable, controller, 'stop'])
 
     def _view_inv(self, action):