Fix poll computers thread, add toggle for shutdown, register in separate thread, log window, reset confirmation, auto submit button should not reset itself

Former-commit-id: 3faf99f0a896935cd3a8251de712559feb58e8ec

Author: benjaoming

data/lcrs-master.desktop

@@ -3,7 +3,7 @@ Name=LCRS
 Comment=Large-scale Computer Reuse Suite
 Exec=lcrs
 Icon=lcrs-lcrs
-Terminal=false
+Terminal=true
 Type=Application
 StartupNotify=true
 Categories=Network

lcrs/master/computer.py

@@ -221,6 +221,8 @@ def __init__(self, computer_id, ipAddress, macAddress, config_master):
         self.wipe_hexsample_before = None # Hex-digest of some sector on HD
         self.wipe_hexsample_after  = None # Hex-digest of some sector on HD
 
+        self.shutdown_after_wiping = False
+        
         self.debug_mode_request = config_master.DEBUG
 
         self.is_registered = False # Says whether the computer has been registered in some database
@@ -363,8 +365,8 @@ def __analyze_scan_data(self, data):
     def __send_to_slave(self, request):
         request = json.dumps(request)
         reply = ""
-        for __ in range(3):
-            # Retry 3 times
+        for __ in range(1):
+            # Retry 1 times
             try:
                 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                 s.settimeout (2.0)
@@ -392,6 +394,7 @@ def __send_to_slave(self, request):
             raise ConnectionException("Timeout connecting")
 
         retries = 0
+        max_retries = 2
         while True:
             try:
                 s.settimeout (5.0)
@@ -405,7 +408,7 @@ def __send_to_slave(self, request):
                 continue
             except socket.timeout:
                 retries += 1
-                if retries > 5:
+                if retries > max_retries:
                     s.close()
                     raise ConnectionException("Timeout while receiving reply")
                 self.state.update(State.NOT_CONNECTED, "Connection timeout")
@@ -515,6 +518,8 @@ def __wipe_thread(self, method, badblocks=False,
         self.state.update(State.WIPED, info="All drives wiped!", progress=1.0)
         self.wipe_finished_on = datetime.now()
         callback_finished(self) if callback_finished else ()
+        if self.drives and self.shutdown_after_wiping:
+            self.shutdown()
 
     def __verify_after_dump(self, dump_data):
         """

lcrs/master/config_master.py

@@ -20,6 +20,8 @@
 import logging
 logger = logging.getLogger('lcrs')
 
+LOG_FILE = "/var/log/lcrs.log"
+
 DEBUG = False
 
 TFTP_COMMAND = "in.tftpd -a %(ip)s -s -l -v -v -v -L %(path)s"

lcrs/master/main.py

@@ -188,7 +188,7 @@ def addGroup(self, name):
     config_master.DEBUG = args.debug
 
     ch = logging.StreamHandler()
-    fh = logging.FileHandler("/var/log/lcrs.log")
+    fh = logging.FileHandler(config_master.LOG_FILE)
 
     formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
     ch.setFormatter(formatter)

lcrs/master/plugins/__init__.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with LCRS.  If not, see <http://www.gnu.org/licenses/>.
 
+import gtk
+
 class CallbackFailed(Exception):
     pass
 
@@ -39,3 +41,18 @@ def activate(self):
 
     def deactivate(self):
         pass
+
+    def show_error_msg(self, msg, parent=None):
+        """Utility function to display a simple error message"""
+        dialog = gtk.MessageDialog(parent=parent if parent else self.mainwindow_instance.win,
+                                   type=gtk.MESSAGE_ERROR,
+                                   buttons = gtk.BUTTONS_CLOSE,
+                                   message_format=msg)
+        dialog.set_modal(True)
+        dialog.set_keep_above(True)
+        def on_close(dialog, *args):
+            dialog.destroy()
+        
+        dialog.connect("response", on_close)
+        dialog.show()
+    

lcrs/master/plugins/fair/__init__.py

@@ -27,8 +27,13 @@
 import simplejson as json
 import shlex
 
+import threading
+
 from lcrs.master.plugins import CallbackFailed, BasePlugin
 
+import logging
+logger = logging.getLogger("lcrs")
+
 class FairIDPlugin(BasePlugin):
 
     plugin_id = "fair"
@@ -80,16 +85,7 @@ def on_set_id(self, computer, input_id):
 
         if fail_msg:
 
-            def on_close(dialog, *args):
-                dialog.destroy()
-
-            dialog = gtk.MessageDialog(parent=self.mainwindow_instance.win,
-                                       type=gtk.MESSAGE_ERROR,
-                                       buttons = gtk.BUTTONS_CLOSE,
-                                       message_format=fail_msg)
-            dialog.connect("response", on_close)
-            dialog.show()
-            
+            self.show_error_msg(fail_msg)
             raise CallbackFailed()
 
     def on_ready_login(self, *args):
@@ -149,39 +145,15 @@ def login(self, *args):
                 self.mainwindow_instance.fair_username = username
                 self.mainwindow_instance.fair_password = password
                 self.win.destroy()
-                #def on_close(dialog, *args):
-                #    dialog.destroy()
-                #    self.win.destroy()
-                #dialog = gtk.MessageDialog(parent=self.win,
-                #                           type=gtk.MESSAGE_INFO,
-                #                           buttons = gtk.BUTTONS_CLOSE,
-                #                           message_format="You are now logged in!",)
-                #dialog.set_modal(True)
-                #dialog.connect("response", on_close)
-                #dialog.show()
-
             else:
-                self.glade.get_object('buttonLogin').set_sensitive(True)
                 fail_msg = r1.read()
             conn.close()
         except:
             fail_msg = "Could not connect to FAIR server"
 
-        
         if fail_msg:
-
-            def on_close(dialog, *args):
-                self.glade.get_object('buttonLogin').set_sensitive(True)
-                dialog.destroy()
-
-            dialog = gtk.MessageDialog(parent=self.win,
-                                       type=gtk.MESSAGE_ERROR,
-                                       buttons = gtk.BUTTONS_CLOSE,
-                                       message_format=fail_msg,)
-            dialog.set_modal(True)
-            dialog.connect("response", on_close)
-            dialog.show()
-            
+            self.glade.get_object('buttonLogin').set_sensitive(True)            
+            self.show_error_msg(fail_msg, parent=self.win)
 
 
     def on_auto_submit(self, computer):
@@ -213,25 +185,27 @@ def on_auto_submit(self, computer):
         response = conn.getresponse()
         data = response.read()
         if response.status != 200:
-            # TODO: Handle this in the log file
-            print "ERROR IN REGISTRATION: %s" % data
+            errmsg = "autosubmit plugin failed: %s" % str(data)
+            self.show_error_msg(errmsg)
+            logger.critical(errmsg)
         conn.close()
 
-
     def on_register(self, computer):
 
-        computer.is_registered = True
-        self.mainwindow_instance.update_computer(computer)
-        self.on_auto_submit(computer)
-        
-        if self.get_config("use_https"):
-            url = "https://%s%s%s" % (self.get_config("fair_server"), URL_REGISTER, computer.id)
-        else:
-            url = "http://%s%s%s" % (self.get_config("fair_server"), URL_REGISTER, computer.id)
-        username = os.getenv("SUDO_USER")
-        
-        if username:
-            subprocess.Popen(shlex.split("su %s -c \"xdg-open %s\"" % (username, url)))
-        else:
-            subprocess.Popen(shlex.split("xdg-open %s" % url))
-
+        def register_thread():
+            self.on_auto_submit(computer)
+            if self.get_config("use_https"):
+                url = "https://%s%s%s" % (self.get_config("fair_server"), URL_REGISTER, computer.id)
+            else:
+                url = "http://%s%s%s" % (self.get_config("fair_server"), URL_REGISTER, computer.id)
+            username = os.getenv("SUDO_USER")
+            
+            if username:
+                subprocess.Popen(shlex.split("su %s -c \"xdg-open %s\"" % (username, url)))
+            else:
+                subprocess.Popen(shlex.split("xdg-open %s" % url))
+    
+        t = threading.Thread(target=register_thread)
+        t.setDaemon(True)
+        t.start()
+        

lcrs/master/ui/computerpanel.py

@@ -50,6 +50,7 @@ def __init__(self, computer, grouppage):
         self.glade.get_object('buttonComputerStart').connect('clicked', self.on_clicked_start)
         self.glade.get_object('checkbuttonWipe').connect('toggled', self.on_toggle_wipe)
         self.glade.get_object('checkbuttonScan').connect('toggled', self.on_toggle_scan)
+        self.glade.get_object('togglebuttonShutdown').connect('toggled', self.on_shutdown_toggled)
 
         self.set_headline()
 
@@ -110,17 +111,25 @@ def set_hardware(self):
                 row[COLUMN_VALUE] = str(hw[key])
                 self.liststore.prepend(row=row)
 
-
+    
+    def on_shutdown_toggled(self, *args, **kwargs):
+        btn = self.glade.get_object("togglebuttonShutdown")
+        on = btn.get_active()
+        self.computer.shutdown_after_wiping = on
+        if on:
+            btn.set_label("On")
+        else:
+            btn.set_label("Off")
+    
     def on_clicked_start(self, *args, **kwargs):
         self.glade.get_object('buttonComputerStart').set_sensitive(False)
         scan = self.glade.get_object('checkbuttonScan').get_active()
         wipe = self.glade.get_object('checkbuttonWipe').get_active()
-        shutdown = self.glade.get_object('checkbuttonShutdown').get_active()
         autosubmit = self.glade.get_object('checkbuttonAutosubmit').get_active()
         badblocks = self.glade.get_object('checkbuttonBadblocks').get_active()
         method = self.glade.get_object("comboboxMethod").get_active_text()
         self.grouppage.process(self.computer, scan, wipe, method, badblocks,
-                               shutdown=shutdown, autosubmit=autosubmit)
+                               autosubmit=autosubmit)
 
     def on_toggle_wipe(self, *args):
         if not self.glade.get_object('checkbuttonWipe').get_active():
@@ -150,7 +159,6 @@ def update(self, *args, **kwargs):
         ready = not self.computer.is_active()
         self.glade.get_object('buttonComputerStart').set_sensitive(is_connected and ready)
         self.glade.get_object('checkbuttonAutosubmit').set_sensitive(bool(self.computer.id))
-        self.glade.get_object('checkbuttonAutosubmit').set_active(bool(self.computer.id))
         if not small_update:
             self.set_hardware()
         self.set_headline()

lcrs/master/ui/getid.py

@@ -52,7 +52,7 @@ def focus_id_entry(self):
         self.glade.get_object('entryID').grab_focus()
 
     def on_cancel(self, *args):
-        self.grouppage.cancel_get_id(self.computer)
+        self.grouppage.on_cancel_get_id(self.computer)
 
     def on_ok(self, *args):
         self.glade.get_object('buttonOK').set_sensitive(False)