Infrastructure/fedora-infrastructure
3
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Bug on output and added timeout on mirrors checking.

Browse source
This commit is contained in:
Davi Vercillo C. Garcia 2009-07-22 19:25:07 -03:00
parent b8bcf519c7
commit 42aab9d2e6
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
scripts/checkMirrors/checkMirrors.py Executable file → Normal file
View file

@ -21,7 +21,7 @@ __VERSION__ = "0.2"
__DATE__ = "21/07/2009" __DATE__ = "21/07/2009"
import sys import sys
import urllib import urllib2
from signal import signal, SIG_DFL from signal import signal, SIG_DFL
class CheckMirrors: class CheckMirrors:
@ -52,16 +52,16 @@ class CheckMirrors:
temp = self.mirror_list_url % (self.directory, self.version, self.architecture) temp = self.mirror_list_url % (self.directory, self.version, self.architecture)
try: try:
self.mirrors = [ url self.mirrors = [ url
for url in urllib.urlopen(temp).read().split("\n") for url in urllib2.urlopen(temp).read().split("\n")
if url != "" and not "#" in url ] if url != "" and not "#" in url ]
except Exception, e: except Exception, error:
print "[ERROR] Failed to get mirror list:", e print "[ERROR] Failed to get mirror list:", error
sys.exit(-1) sys.exit(-1)
temp = self.main_mirror % (self.directory, self.version, self.architecture) temp = self.main_mirror % (self.directory, self.version, self.architecture)
try: try:
self.repodata = urllib.urlopen(temp + self.xml_filename).read() self.repodata = urllib2.urlopen(temp + self.xml_filename).read()
except Exception, e: except Exception, error:
print "[ERROR] Failed to get XML repodata file:", e print "[ERROR] Failed to get XML repodata file:", error
sys.exit(-1) sys.exit(-1)
self.number_total_mirrors = len(self.mirrors) self.number_total_mirrors = len(self.mirrors)
if self.number_total_mirrors == 0: if self.number_total_mirrors == 0:
@ -71,22 +71,20 @@ class CheckMirrors:
def check_mirrors(self): def check_mirrors(self):
"""Method that verify, for each mirror, if its repomd.xml is equal of that on main. """Method that verify, for each mirror, if its repomd.xml is equal of that on main.
""" """
print "\nChecking the repositories repodata !\n\nUsing:", self.main_mirror % (self.directory, self.version, self.architecture) print "\nChecking the repositories repodata !\n\nUsing:", self.main_mirror % (self.directory, self.version, self.architecture)
counter = 0
for url in self.mirrors: for url in self.mirrors:
print "\rTesting: %d/%d" % (counter , self.number_total_mirrors), print "\rTesting: %d/%d" % (self.good_mirrors[1] , self.number_total_mirrors),
sys.stdout.flush() sys.stdout.flush()
try: try:
if urllib.urlopen(url + self.xml_filename).read() == self.repodata: if urllib2.urlopen(url + self.xml_filename, timeout=10).read() == self.repodata:
self.good_mirrors[0].append(url) self.good_mirrors[0].append(url)
self.good_mirrors[1] += 1 self.good_mirrors[1] += 1
else: else:
self.bad_mirrors[0].append(url) self.bad_mirrors[0].append(url)
self.bad_mirrors[1] += 1 self.bad_mirrors[1] += 1
except Exception, error.msg: except Exception, error:
self.error_mirrors[0].append(url + "\n[" + error.msg + "]") self.error_mirrors[0].append(url + "\n[" + str(error) + "]")
self.error_mirrors[1] += 1 self.error_mirrors[1] += 1
counter += 1
def print_results(self): def print_results(self):
"""Method that put the results on STDOUT. """Method that put the results on STDOUT.
@ -123,6 +121,9 @@ class CheckMirrors:
if __name__ == "__main__": if __name__ == "__main__":
"""Main Function.
If the programs was called as a script, this will be executed.
"""
signal(2, SIG_DFL) signal(2, SIG_DFL)
if len(sys.argv) == 4: if len(sys.argv) == 4:
CheckMirrors(sys.argv[1], sys.argv[2], sys.argv[3], ).run() CheckMirrors(sys.argv[1], sys.argv[2], sys.argv[3], ).run()