Changeset 2510

Timestamp:

Sep 22, 2016, 2:58:29 PM (3 years ago)

Author:

kbut

Message:

wip

Location:

lliurex-mirror/trunk/fuentes

Files:

• lliurex-mirror-gui/lliurex_mirror_connect.py (modified) (4 diffs)
• n4d-lliurex-mirror.install/usr/share/n4d/python-plugins/MirrorManager.py (modified) (1 diff)

lliurex-mirror/trunk/fuentes/lliurex-mirror-gui/lliurex_mirror_connect.py

@@ -97 +97 @@
         def export(self, mirror,folder):
                 import tempfile
+
+                # Get config for this mirror
                 result = self.client.get_all_configs(self.credentials,'MirrorManager')
                 config = result['msg'][mirror]
+                
+                # Open webserver for mirror and get ip
+                result = self.client.enable_webserver_into_folder(self.credentials,'MirrorManager',config['MIRROR_PATH'])
+
+                # Modify Config and write
+                
                 config['MIRROR_PATH'] = folder
+                config[] = '3'
+                config['ORIGS']['3'] = self.serverip + ":" + str(result['msg'])
                 result = self.client.render_debmirror_config(self.credentials,'MirrorManager',config)
                 temp_file = tempfile.mktemp()
@@ -105 +115 @@
                 f.write(result['msg'])
                 f.close()
+
+                # Execute mirror
                 self.localclient.get_mirror(self.localcredentials,'MirrorManager',temp_file)
                 return True
@@ -116 +128 @@
         def is_alive_export(self):
                 result = self.localclient.is_alive_get_mirror(self.localcredentials,'MirrorManager')
+                print result
                 return result['status']
 
@@ -146 +159 @@
         #print c.update('llx16','3')
         #print c.mirror_list()
-        #print c.export('llx16','/net/miexportacion')
-        print c.is_alive_export()
+        print c.export('llx16','/net/miexportacion')
+        #print c.is_alive_export()
         #print c.get_percentage('llx16')
         #print c.is_alive()

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

@@ -33 +33 @@
                 self.tpl_env = Environment(loader=FileSystemLoader('/usr/share/n4d/templates/lliurex-mirror'))
                 self.update_thread=threading.Thread()
+                self.get_mirror_thread = threading.Thread()
                 self.percentage=(0,None)
+                self.exportpercentage = 0
                 self.mirrorworking = None
                 self.webserverprocess = None