Changeset 2043

Timestamp:

Jun 28, 2016, 11:53:32 PM (3 years ago)

Author:

kbut

Message:

add variables with info into n4d vars

File:

• lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py (modified) (7 diffs)

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py

@@ -34 +34 @@
                 self.percentage=(0,None)
                 self.webserverprocess = None
+                self.defaultmirrorinfo = {"status_mirror":"Ok","last_mirror_date":None,"mirror_size":0,"progress":0}
                 
         #def init
@@ -44 +45 @@
                 if self.variable==None:
                         try:
-                                self.n4d_vars.add_variable("LLIUREXMIRROR",{"internal":{}},"","Lliurex Mirror info variable","n4d-lliurex-mirror")
+                                self.n4d_vars.add_variable("LLIUREXMIRROR",{},"","Lliurex Mirror info variable","n4d-lliurex-mirror")
                         except Exception as e:
                                 pass
@@ -50 +51 @@
                 if type(self.variable)!=type({}):
                         self.variable={}
-                        self.variable["internal"]={}
-                
-                if self.variable["internal"].has_key("status_mirror") and self.variable["internal"]["status_mirror"] == "Working":
-                        if not self.update_thread.isAlive():
-                                self.variable["internal"]['status_mirror'] = "Error"
-                                self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
-
+                
+                try:
+                        for repo in self.get_available_mirrors()['msg']:
+                                if self.variable.has_key(repo) and self.variable[repo].has_key("status_mirror") and self.variable[repo]["status_mirror"] == "Working":
+                                        if not self.update_thread.isAlive():
+                                                self.variable[repo]["status_mirror"] = "Error"
+                                                self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
+                except Exception as e:
+                        pass
         #def startup
 
@@ -125 +128 @@
         
         def _update(self,distro):
-
+                if not self.variable.has_key(distro):
+                        self.variable[distro]=self.defaultmirrorinfo 
                 # link config debmirror to correct path with distro name
-                self.variable["internal"]['status_mirror'] = "Working"
+                self.variable[distro]['status_mirror'] = "Working"
                 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                 filelog = open('/var/log/lliurex-mirror.log','w')
@@ -155 +159 @@
                                         self.percentage=(self.percentage[0],status)
 
-                                        self.variable["internal"]['status_mirror'] = "Ok" if status == 0 else "Error"
+                                        self.variable[distro]['status_mirror'] = "Ok" if status == 0 else "Error"
                                         self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                                         break
                         except Exception as e:
-                                self.variable["internal"]['status_mirror'] = "Error"
+                                self.variable[distro]['status_mirror'] = "Error"
                                 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                                 break
@@ -192 +196 @@
                 MIRROR_SIZE=self.get_size(mirrorpath)
                 
-                self.variable["internal"]["last_mirror_date"]=MIRROR_DATE
-                self.variable["internal"]["mirror_size"]=str(MIRROR_SIZE)
-                self.variable["internal"]["progress"]=self.percentage[0]
+                self.variable[distro]["last_mirror_date"]=MIRROR_DATE
+                self.variable[distro]["mirror_size"]=str(MIRROR_SIZE)
+                self.variable[distro]["progress"]=self.percentage[0]
                 
                 print self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
@@ -299 +303 @@
         #def set_mirror_architecture
 
-        def get_percentage(self):
-                if not self.is_alive():
-                        return {'status':True,'msg':self.variable['internal']['progress']};
-                return {'status':True,'msg':self.percentage}
+        def get_percentage(self,distro):
+                if self.variable.has_key(distro):
+                        return {'status':True,'msg':self.variable[distro]['progress']}
+                else:
+                        return {'status':False,'msg':'this repo nos has been configured'}
 
         def build_debmirror_config(self,distro):