donate-cpu-server: try to handle uploaded crash results better

This commit is contained in:
Daniel Marjamäki 2018-11-19 10:57:04 +01:00
parent f5c2abaefa
commit 347c46491a
1 changed files with 18 additions and 11 deletions

View File

@ -462,17 +462,24 @@ def server(server_address_port, packages, packageIndex, resultPath):
# save data # save data
res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.gz',url) res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.gz',url)
if res and url in packages: if res is None:
print('results added for package ' + res.group(1)) print('results not written. res is None.')
filename = resultPath + '/' + res.group(1) continue
with open(filename, 'wt') as f: if url not in packages:
f.write(strDateTime() + '\n' + data) url2 = url + '\n'
# track latest added results.. if url2 not in packages:
if len(latestResults) >= 20: print('results not written. url is not in packages.')
latestResults = latestResults[1:] continue
latestResults.append(filename) print('results added for package ' + res.group(1))
with open('latest.txt', 'wt') as f: filename = resultPath + '/' + res.group(1)
f.write(' '.join(latestResults)) with open(filename, 'wt') as f:
f.write(strDateTime() + '\n' + data)
# track latest added results..
if len(latestResults) >= 20:
latestResults = latestResults[1:]
latestResults.append(filename)
with open('latest.txt', 'wt') as f:
f.write(' '.join(latestResults))
else: else:
print('[' + strDateTime() + '] invalid command: ' + firstLine) print('[' + strDateTime() + '] invalid command: ' + firstLine)
connection.close() connection.close()