Changeset 2036

Timestamp:

Jun 28, 2016, 11:31:22 AM (3 years ago)

Author:

kbut

Message:

add function to stop build

Location:

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install

Files:

• etc/n4d/conf.d/MirrorManager (modified) (1 diff)
• usr/share/lliurex-mirror/conf/llx14.json (modified) (1 diff)
• usr/share/lliurex-mirror/conf/llx15.json (modified) (1 diff)
• usr/share/lliurex-mirror/conf/llx16.json (modified) (1 diff)
• usr/share/n4d/python-plugins/MirrorManager.py (modified) (5 diffs)
• usr/share/n4d/templates/lliurex-mirror/debmirror.conf (modified) (1 diff)

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/etc/n4d/conf.d/MirrorManager

@@ -19 +19 @@
 get_checksum_validation=anonymous,*
 get_available_mirrors=anonymous,*
+stopupdate=adm,admins

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/lliurex-mirror/conf/llx14.json

@@ -4 +4 @@
     "SECTIONS": ["main", "main/debian-installer", "universe", "restricted", "multiverse", "partner"],
     "MIRRORPATH": "/net/mirror/llx1406", 
-    "DISTRO": "precise",
+    "DISTROS": ["precise","precise-updates","precise-security"],
     "IGN_GPG":1,
     "IGN_RELEASE":0,

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/lliurex-mirror/conf/llx15.json

@@ -4 +4 @@
     "SECTIONS": ["main", "main/debian-installer", "universe", "restricted", "multiverse", "partner"],
     "MIRRORPATH": "/net/mirror/llx1505", 
-    "DISTRO": "trusty",
+    "DISTROS": ["trusty","trusty-security","trusty-updates"],
     "IGN_GPG":1,
     "IGN_RELEASE":0,

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/lliurex-mirror/conf/llx16.json

@@ -4 +4 @@
     "SECTIONS": ["main", "main/debian-installer", "universe", "restricted", "multiverse", "partner"],
     "MIRRORPATH": "/net/mirror/llx16", 
-    "DISTRO": "xenial",
+    "DISTROS": ["xenial","xenial-updates","xenial-security"],
     "IGN_GPG":1,
     "IGN_RELEASE":0,

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

@@ -28 +28 @@
                 self.distro="llx16"
                 self.httpd = None
+                self.debmirrorprocess = None
 
                 self.tpl_env = Environment(loader=FileSystemLoader('/usr/share/n4d/templates/lliurex-mirror'))
@@ -128 +129 @@
                 self.variable["internal"]['status_mirror'] = "Working"
                 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
-
+                filelog = open('/var/log/lliurex-mirror.log','w')
                 self.build_debmirror_config(distro)
                 os.remove('/etc/debmirror.conf')
                 os.symlink(os.path.join(self.debmirrorconfpath,distro),'/etc/debmirror.conf')
-                child=pexpect.spawn("/usr/bin/debmirror")
+                self.debmirrorprocess=pexpect.spawn("/usr/bin/debmirror")
                 try:
                         objects["ZCenterVariables"].add_pulsating_color("lliurexmirror")
@@ -139 +140 @@
                 while True:
                         try:
-                                child.expect('\n')
-                                line =child.before 
-                                print(line)
+                                self.debmirrorprocess.expect('\n')
+                                line =self.debmirrorprocess.before
+                                filelog.write(line)
                                 line1=line.strip("\n")
                                 if line1.startswith("[") and line1[5] == "]":
-                                        self.percentage=(int(line1[1:4].strip()),child.exitstatus)
+                                        self.percentage=(int(line1[1:4].strip()),self.debmirrorprocess.exitstatus)
                         except pexpect.EOF:
-                                        line1 = child.before
+                                        line1 = self.debmirrorprocess.before
                                         if line1 != "" and line1.startswith("[") and line1[5] == "]":
-                                                        self.percentage=(int(line1[1:4].strip()),child.exitstatus)
-
-                                        child.close()
-                                        status = child.exitstatus
+                                                        self.percentage=(int(line1[1:4].strip()),self.debmirrorprocess.exitstatus)
+                                        filelog.write(line1)
+                                        self.debmirrorprocess.close()
+                                        status = self.debmirrorprocess.exitstatus
                                         self.percentage=(self.percentage[0],status)
 
@@ -161 +162 @@
                                 self.n4d_vars.set_variable("LLIUREXMIRROR",self.variable)
                                 break
-                                
+                filelog.close()
                 self.set_mirror_info(distro)
 
@@ -372 +373 @@
                 versions = [ version.replace('.json','') for version in versions if version.endswith('.json')]
                 return {'status':True,'msg':versions}
+
+        def stopupdate(self):
+                try:
+                        self.debmirrorprocess.terminate()
+                        return {'status':true,'msg':'debmirror stopped'}
+                except Exception as e:
+                        return {'status':False,'msg':str(e)}
+

lliurex-mirror/trunk/fuentes/n4d-lliurex-mirror.install/usr/share/n4d/templates/lliurex-mirror/debmirror.conf

@@ -26 +26 @@
 $remoteroot="";
 $download_method="http";
-@dists="{{ DISTRO }}";
+@dists="{% for distribution in DISTROS %}{{distribution}}{% if not loop.last %},{%endif%}{% endfor %}";
 @sections="{% for section in SECTIONS %}{{section}}{% if not loop.last %},{%endif%}{% endfor %}";
 @arches=({% for arch in ARCHITECTURES %}"{{arch}}"{% if not loop.last %},{%endif%}{% endfor %});