Changeset 7554

Timestamp:

Jun 27, 2018, 12:23:59 PM (3 years ago)

Author:

daduve

Message:

Adding log

Location:

home-eraser/trunk/fuentes

Files:

• home-eraser-gui.install/usr/share/home-eraser/HomeEraser.py (modified) (5 diffs)
• home-eraser-gui.install/usr/share/home-eraser/N4dManager.py (modified) (2 diffs)
• home-eraser-server.install/etc/n4d/conf.d/HomeEraserServer (modified) (1 diff)
• home-eraser-server.install/usr/share/n4d/python-plugins/HomeEraserServer.py (modified) (1 diff)

home-eraser/trunk/fuentes/home-eraser-gui.install/usr/share/home-eraser/HomeEraser.py

@@ -24 +24 @@
 
 
+
 class Spinner:
     busy = False
@@ -66 +67 @@
         teachers="teachers"
         admins="admins"
+        #log="/var/log/home_eraser.log"
         
         detect_connected_clients_cancelled=False
@@ -72 +74 @@
         
         def dprint(self,arg):
-                
+                self.n4d_man.lprint(self.user_val, "[HomeEraserGUI] %s"%arg)
                 if HomeEraser.DEBUG:
                         print("[HomeEraserGUI] %s"%arg)
                 
-        #def dprint
-        
+        #def dprint     
         
         
@@ -232 +233 @@
                         self.dprint("Summary to remove this elements: %s"%(delete))
                         
-                        resume={}
+                        #Are you sure to delete????
+                        
+                        if ( len(delete[self.home]) >0 ) or ( len(delete[self.net]) >0 ):
+                                
+                                dialog = Gtk.MessageDialog(None,0,Gtk.MessageType.WARNING, Gtk.ButtonsType.YES_NO, "HOME ERASER")
+                                dialog.format_secondary_text(_("Are you sure to delete?"))
+                                response=dialog.run()
+                                dialog.destroy()
+                                if response == Gtk.ResponseType.YES:
+                                
+                                        self.apply_delete_methods(delete)
+                                        self.detect_connected_clients_cancelled=True
+                                        Gtk.main_quit()
+                                        sys.exit(0)
+                        else:
+                                dialog = Gtk.MessageDialog(None,0,Gtk.MessageType.INFO, Gtk.ButtonsType.OK, "HOME ERASER")
+                                dialog.format_secondary_text(_("You don't select any option to delete."))
+                                response=dialog.run()
+                                dialog.destroy()
+
+                        
+                        
+                        
+                        
+                except Exception as e:
+                        print ("[HomeEraserGUI] %s"%e)
+                        return [False,str(e)]
+                
+        #def check_changes
+        
+        
+        
+        
+        
+        def apply_delete_methods(self,delete):
+                
+                try:
+                        resume_home={}
+                        resume_net=[]
                         
                         #DELETE LOCAL HOMES IN FAT CLIENTS
@@ -241 +280 @@
                                 if r[0]:
                                         #shared in resume all ips and paths deleted
-                                        resume={**resume,**r[1]}
+                                        resume_home={**resume_home,**r[1]}
                         
                         #print resume home deleted in fat clients
-                        if (  len(resume) >0 ):
+                        if (  len(resume_home) >0 ):
                                 self.dprint("")
                                 self.dprint("Summary for HOMES deleted")
-                                for i in resume:
-                                        self.dprint("%s : %s"%(i,resume[i]))
+                                for i in resume_home:
+                                        self.dprint("%s : %s"%(i,resume_home[i]))
                         
                         
                         #DELETE /NET DIRECTORIES
                         if ( len(delete[self.net] ) > 0 ):
-                                r=self.n4d_man.delete_net_homes(self.user_val,delete[self.net])
-                                if r[0]:
+                                rnet=self.n4d_man.delete_net_homes(self.user_val,delete[self.net])
+                                if rnet[0]:
+                                        resume_net=rnet[1]
                                         self.dprint("")
                                         self.dprint("Summary for paths in /NET deleted:")
-                                        for i in r[1]:
+                                        for i in rnet[1]:
                                                 self.dprint(i)
+                                                
+                        return[True,resume_home,resume_net]
                                         
-                                        
-                        self.detect_connected_clients_cancelled=True
-                        Gtk.main_quit()
-                        sys.exit(0)
-                        
                 except Exception as e:
                         print ("[HomeEraserGUI] %s"%e)
                         return [False,str(e)]
                 
-        #def check_changes
+                
+        #def_apply_delete_methods
 
 

home-eraser/trunk/fuentes/home-eraser-gui.install/usr/share/home-eraser/N4dManager.py

@@ -17 +17 @@
                 self.detected_clients=0
                 self.ips_connected=[]
+                ctxt=ssl._create_unverified_context()
+                self.client_log=xmlrpc.client.ServerProxy("https://server:9779",allow_none=True,context=ctxt)
 
                 if server!=None:
@@ -22 +24 @@
                 
         #def init
+        
+        def lprint(self,validation,arg):
+                
+                self.client_log.lprint(validation,"HomeEraserServer", arg)
+                
+        #def_lprint
         
         

home-eraser/trunk/fuentes/home-eraser-server.install/etc/n4d/conf.d/HomeEraserServer

@@ -6 +6 @@
 delete_home=adm,admins,admin
 delete_net_home=adm,admins,admin
+lprint=adm,admins,admin

home-eraser/trunk/fuentes/home-eraser-server.install/usr/share/n4d/python-plugins/HomeEraserServer.py

@@ -1 +1 @@
 import os
 import pwd
+import logging
+
 
 class HomeEraserServer:
         
+        logging.basicConfig(format = '%(asctime)s %(message)s',datefmt = '%m/%d/%Y %I:%M:%S %p',filename = '/var/log/home-eraser.log',level=logging.DEBUG)
+        
         DEBUG=True
         
+        def lprint(self,arg):
+                
+                logging.debug(arg)
+                
+        #def_lprint
+        
         def dprint(self,arg):
                 
+                self.lprint("[HomeEraserServer] %s"%arg)
                 if HomeEraserServer.DEBUG:
                         print("[HomeEraserServer] %s"%arg)