Changeset 4747

Timestamp:

May 15, 2017, 12:33:47 PM (2 years ago)

Author:

daduve

Message:

Adding log to llx-remote-installer server

Location:

lliurex-remote-installer/trunk/fuentes

Files:

• lliurex-remote-installer-gui.install/usr/share/lliurex-remote-installer/N4dManager.py (modified) (1 diff)
• lliurex-remote-installer-server.install/etc/n4d/conf.d/LliureXRemoteInstaller (modified) (1 diff)
• lliurex-remote-installer-server.install/usr/share/n4d/python-plugins/LliureXRemoteInstaller.py (modified) (4 diffs)

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-gui.install/usr/share/lliurex-remote-installer/N4dManager.py

@@ -102 +102 @@
                 try:
                         #self.variable.update(dict)
+                        dict_orig=self.get_variable()
+                        #print dict_orig
+                        write_log=self.client.write_log(self.user,"LliureXRemoteInstaller",self.user[0],dict,dict_orig[1])
                         if self.client.set_variable(self.user,"VariablesManager",self.N4D_VAR,dict)[0]:
                                 return True

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-server.install/etc/n4d/conf.d/LliureXRemoteInstaller

@@ -19 +19 @@
 mirror_version =admin,admins,adm,teachers
 net_mirror_version =admin,admins,adm,teachers
+write_log =admin,admins,adm,teachers

lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-server.install/usr/share/n4d/python-plugins/LliureXRemoteInstaller.py

@@ -4 +4 @@
 import shutil
 import re
+import datetime
+import json
 from urllib2 import urlopen
 
@@ -28 +30 @@
         NET_MIRROR_DIRECTORY='http://lliurex.net/xenial'
         TIMESTAMP_DIRECTORY='/pool/main/l/lliurex-version-timestamp/'
+        LOG_FILE='/var/log/llx-remote.log'
         
         
@@ -145 +148 @@
                         return [False,str(e)]
         #def_mirror_version
+        
+        
+        def write_log(self, user, dict,dict_orig):
+                try:
+                        if os.path.exists(self.LOG_FILE):
+                                option='a'
+                        else :
+                                option='w'
+                        print ('Option to write_log is.......%s'%option)
+                        date=datetime.datetime.now()
+                        date_update=date.strftime("%d-%m-%Y %H:%M")
+                        d1_keys = set(dict.keys())
+                        d2_keys = set(dict_orig.keys())
+                        intersect_keys = d1_keys.intersection(d2_keys)
+                        added = d1_keys - d2_keys
+                        removed = d2_keys - d1_keys
+                        modified = {o : (dict[o]) for o in intersect_keys if dict[o] != dict_orig[o]}
+                        print ('New data to write_log is.......%s'%modified)
+                        f=open(self.LOG_FILE,option)
+                        f.write('### User: %s \n'%(user))
+                        f.write('### Date: %s \n'%date_update)
+                        f.write('*** Data modified: %s \n'%modified)
+                        #f.write(json.dumps(new_data))
+                        f.write('------------------------------------\n')
+                        f.write(json.dumps(dict))
+                        f.write('\n')
+                        f.write('\n')
+                        f.close
+                        return [True]
+                except Exception as e:
+                        print e
+                        return [False,str(e)]
+                
+        #def_write_log
 
         def update_var_dict (self,namevar=None,dict={},user=None,passwd=None):
@@ -154 +191 @@
                                 c=x.ServerProxy("https://server:9779")
                                 if objects["VariablesManager"].set_variable(namevar,dict)[0]:
+                                        if os.path.exists(self.LOG_FILE):
+                                                option='w'
+                                        else :
+                                                option='a'
+                                        date=datetime.datetime.now()
+                                        date_update=datestrftime("%d-%m-%Y %H:%M")
+                                        f=open(self.LOG_FILE,option)
+                                        f.write('### User: %s has modificated LLX-Remote at: %s'%(user,date_update))
+                                        f.write(dict)
+                                        f.close
                                         COMMENT="[LLXRemoteInstaller] (update_var_list) %s has been updated with this list of APP %s" %(namevar,dict)
                                         print ("%s" %COMMENT)