Changeset 4747
- Timestamp:
- May 15, 2017, 12:33:47 PM (4 years ago)
- Location:
- lliurex-remote-installer/trunk/fuentes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-gui.install/usr/share/lliurex-remote-installer/N4dManager.py
r4737 r4747 102 102 try: 103 103 #self.variable.update(dict) 104 dict_orig=self.get_variable() 105 #print dict_orig 106 write_log=self.client.write_log(self.user,"LliureXRemoteInstaller",self.user[0],dict,dict_orig[1]) 104 107 if self.client.set_variable(self.user,"VariablesManager",self.N4D_VAR,dict)[0]: 105 108 return True -
lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-server.install/etc/n4d/conf.d/LliureXRemoteInstaller
r4737 r4747 19 19 mirror_version =admin,admins,adm,teachers 20 20 net_mirror_version =admin,admins,adm,teachers 21 write_log =admin,admins,adm,teachers -
lliurex-remote-installer/trunk/fuentes/lliurex-remote-installer-server.install/usr/share/n4d/python-plugins/LliureXRemoteInstaller.py
r4737 r4747 4 4 import shutil 5 5 import re 6 import datetime 7 import json 6 8 from urllib2 import urlopen 7 9 … … 28 30 NET_MIRROR_DIRECTORY='http://lliurex.net/xenial' 29 31 TIMESTAMP_DIRECTORY='/pool/main/l/lliurex-version-timestamp/' 32 LOG_FILE='/var/log/llx-remote.log' 30 33 31 34 … … 145 148 return [False,str(e)] 146 149 #def_mirror_version 150 151 152 def write_log(self, user, dict,dict_orig): 153 try: 154 if os.path.exists(self.LOG_FILE): 155 option='a' 156 else : 157 option='w' 158 print ('Option to write_log is.......%s'%option) 159 date=datetime.datetime.now() 160 date_update=date.strftime("%d-%m-%Y %H:%M") 161 d1_keys = set(dict.keys()) 162 d2_keys = set(dict_orig.keys()) 163 intersect_keys = d1_keys.intersection(d2_keys) 164 added = d1_keys - d2_keys 165 removed = d2_keys - d1_keys 166 modified = {o : (dict[o]) for o in intersect_keys if dict[o] != dict_orig[o]} 167 print ('New data to write_log is.......%s'%modified) 168 f=open(self.LOG_FILE,option) 169 f.write('### User: %s \n'%(user)) 170 f.write('### Date: %s \n'%date_update) 171 f.write('*** Data modified: %s \n'%modified) 172 #f.write(json.dumps(new_data)) 173 f.write('------------------------------------\n') 174 f.write(json.dumps(dict)) 175 f.write('\n') 176 f.write('\n') 177 f.close 178 return [True] 179 except Exception as e: 180 print e 181 return [False,str(e)] 182 183 #def_write_log 147 184 148 185 def update_var_dict (self,namevar=None,dict={},user=None,passwd=None): … … 154 191 c=x.ServerProxy("https://server:9779") 155 192 if objects["VariablesManager"].set_variable(namevar,dict)[0]: 193 if os.path.exists(self.LOG_FILE): 194 option='w' 195 else : 196 option='a' 197 date=datetime.datetime.now() 198 date_update=datestrftime("%d-%m-%Y %H:%M") 199 f=open(self.LOG_FILE,option) 200 f.write('### User: %s has modificated LLX-Remote at: %s'%(user,date_update)) 201 f.write(dict) 202 f.close 156 203 COMMENT="[LLXRemoteInstaller] (update_var_list) %s has been updated with this list of APP %s" %(namevar,dict) 157 204 print ("%s" %COMMENT)
Note: See TracChangeset
for help on using the changeset viewer.