daca2: Use logging module instead of opening/closing results file
This commit is contained in:
parent
c250e385d3
commit
743dcdd669
|
@ -14,6 +14,7 @@ import glob
|
||||||
import os
|
import os
|
||||||
import datetime
|
import datetime
|
||||||
import time
|
import time
|
||||||
|
import logging
|
||||||
|
|
||||||
DEBIAN = ['ftp://ftp.se.debian.org/debian/',
|
DEBIAN = ['ftp://ftp.se.debian.org/debian/',
|
||||||
'ftp://ftp.debian.org/debian/']
|
'ftp://ftp.debian.org/debian/']
|
||||||
|
@ -88,21 +89,17 @@ def removeAllExceptResults():
|
||||||
try:
|
try:
|
||||||
if os.path.isdir(filename):
|
if os.path.isdir(filename):
|
||||||
shutil.rmtree(filename, onerror=handleRemoveReadonly)
|
shutil.rmtree(filename, onerror=handleRemoveReadonly)
|
||||||
elif filename != 'results.txt':
|
elif filename != RESULTS_FILENAME:
|
||||||
os.remove(filename)
|
os.remove(filename)
|
||||||
break
|
break
|
||||||
except WindowsError as err:
|
except WindowsError as err:
|
||||||
time.sleep(30)
|
time.sleep(30)
|
||||||
if count == 0:
|
if count == 0:
|
||||||
f = open('results.txt','at')
|
logging.error('Failed to cleanup {}: {}'.format(filename, err))
|
||||||
f.write('Failed to cleanup ' + filename + ': ' + str(err))
|
|
||||||
f.close()
|
|
||||||
except OSError as err:
|
except OSError as err:
|
||||||
time.sleep(30)
|
time.sleep(30)
|
||||||
if count == 0:
|
if count == 0:
|
||||||
f = open('results.txt','at')
|
logging.error('Failed to cleanup {}: {}'.format(filename, err))
|
||||||
f.write('Failed to cleanup ' + filename + ': ' + str(err))
|
|
||||||
f.close()
|
|
||||||
|
|
||||||
|
|
||||||
def removeLargeFiles(path):
|
def removeLargeFiles(path):
|
||||||
|
@ -123,26 +120,20 @@ def removeLargeFiles(path):
|
||||||
try:
|
try:
|
||||||
os.remove(g)
|
os.remove(g)
|
||||||
except OSError as err:
|
except OSError as err:
|
||||||
f = open('results.txt','at')
|
logging.error('Failed to remove {}: {}'.format(g, err))
|
||||||
f.write('Failed to remove ' + g + ': ' + str(err))
|
|
||||||
f.close()
|
|
||||||
|
|
||||||
def strfCurrTime(fmt):
|
def strfCurrTime(fmt):
|
||||||
return datetime.time.strftime(datetime.datetime.now().time(), fmt)
|
return datetime.time.strftime(datetime.datetime.now().time(), fmt)
|
||||||
|
|
||||||
def scanarchive(filepath, jobs, cpulimit):
|
def scanarchive(filepath, jobs, cpulimit):
|
||||||
# remove all files/folders except results.txt
|
# remove all files/folders except RESULTS_FILENAME
|
||||||
removeAllExceptResults()
|
removeAllExceptResults()
|
||||||
|
|
||||||
results = open('results.txt', 'at')
|
logging.info(DEBIAN[0] + filepath)
|
||||||
results.write(DEBIAN[0] + filepath + '\n')
|
|
||||||
results.close()
|
|
||||||
|
|
||||||
if not wget(filepath):
|
if not wget(filepath):
|
||||||
if not wget(filepath):
|
if not wget(filepath):
|
||||||
results = open('results.txt', 'at')
|
logging.error('wget failed at {}', filepath)
|
||||||
results.write('wget failed\n')
|
|
||||||
results.close()
|
|
||||||
return
|
return
|
||||||
|
|
||||||
filename = filepath[filepath.rfind('/') + 1:]
|
filename = filepath[filepath.rfind('/') + 1:]
|
||||||
|
@ -168,14 +159,12 @@ def scanarchive(filepath, jobs, cpulimit):
|
||||||
p = subprocess.Popen(cmds, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
p = subprocess.Popen(cmds, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
comm = p.communicate()
|
comm = p.communicate()
|
||||||
|
|
||||||
results = open('results.txt', 'at')
|
|
||||||
if p.returncode == 0:
|
if p.returncode == 0:
|
||||||
results.write(comm[1] + strfCurrTime('[%H:%M]') + '\n')
|
logging.info(comm[1] + strfCurrTime('[%H:%M]'))
|
||||||
elif comm[0].find('cppcheck: error: could not find or open any of the paths given.') < 0:
|
elif comm[0].find('cppcheck: error: could not find or open any of the paths given.') < 0:
|
||||||
results.write(comm[1] + strfCurrTime('[%H:%M]') + '\n')
|
logging.error(comm[1] + strfCurrTime('[%H:%M]'))
|
||||||
results.write('Exit code is not zero! Crash?\n')
|
logging.error('Exit code is not zero! Crash?\n')
|
||||||
results.write('\n')
|
|
||||||
results.close()
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(description='Checks debian source code')
|
parser = argparse.ArgumentParser(description='Checks debian source code')
|
||||||
parser.add_argument('folder', metavar='FOLDER')
|
parser.add_argument('folder', metavar='FOLDER')
|
||||||
|
@ -196,11 +185,19 @@ workdir = os.path.join(workdir, args.folder)
|
||||||
if not os.path.isdir(workdir):
|
if not os.path.isdir(workdir):
|
||||||
os.makedirs(workdir)
|
os.makedirs(workdir)
|
||||||
|
|
||||||
|
RESULTS_FILENAME = 'results.txt'
|
||||||
|
RESULTS_FILE = os.path.join(workdir, RESULTS_FILENAME)
|
||||||
|
|
||||||
|
logging.basicConfig(
|
||||||
|
filename=RESULTS_FILE,
|
||||||
|
level=logging.INFO,
|
||||||
|
format='%(message)s')
|
||||||
|
|
||||||
print(workdir)
|
print(workdir)
|
||||||
|
|
||||||
archives = getpackages(args.folder)
|
archives = getpackages(args.folder)
|
||||||
if len(archives) == 0:
|
if len(archives) == 0:
|
||||||
print('failed to load packages')
|
logging.critical('failed to load packages')
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if not os.path.isdir(workdir):
|
if not os.path.isdir(workdir):
|
||||||
|
@ -208,13 +205,11 @@ if not os.path.isdir(workdir):
|
||||||
os.chdir(workdir)
|
os.chdir(workdir)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
results = open('results.txt', 'wt')
|
logging.info('STARTDATE ' + str(datetime.date.today()))
|
||||||
results.write('STARTDATE ' + str(datetime.date.today()) + '\n')
|
logging.info('STARTTIME ' + strfCurrTime('%H:%M:%S'))
|
||||||
results.write('STARTTIME ' + strfCurrTime('%H:%M:%S') + '\n')
|
|
||||||
if args.rev:
|
if args.rev:
|
||||||
results.write('GIT-REVISION ' + args.rev + '\n')
|
logging.info('GIT-REVISION ' + args.rev + '\n')
|
||||||
results.write('\n')
|
logging.info('')
|
||||||
results.close()
|
|
||||||
|
|
||||||
for archive in archives:
|
for archive in archives:
|
||||||
if len(args.skip) > 0:
|
if len(args.skip) > 0:
|
||||||
|
@ -224,13 +219,11 @@ try:
|
||||||
continue
|
continue
|
||||||
scanarchive(archive, args.jobs, args.cpulimit)
|
scanarchive(archive, args.jobs, args.cpulimit)
|
||||||
|
|
||||||
results = open('results.txt', 'at')
|
logging.info('DATE {}'.format(datetime.date.today()))
|
||||||
results.write('DATE ' + str(datetime.date.today()) + '\n')
|
logging.info('TIME {}'.format(strfCurrTime('%H:%M:%S')))
|
||||||
results.write('TIME ' + strfCurrTime('%H:%M:%S') + '\n')
|
|
||||||
results.close()
|
|
||||||
|
|
||||||
except EOFError:
|
except EOFError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# remove all files/folders except results.txt
|
# remove all files/folders except RESULTS_FILENAME
|
||||||
removeAllExceptResults()
|
removeAllExceptResults()
|
||||||
|
|
Loading…
Reference in New Issue