From 347c46491a85aca808f55966ecab5e0e45f4cb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Mon, 19 Nov 2018 10:57:04 +0100 Subject: [PATCH] donate-cpu-server: try to handle uploaded crash results better --- tools/donate-cpu-server.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tools/donate-cpu-server.py b/tools/donate-cpu-server.py index ea0f8a86b..17be5e953 100644 --- a/tools/donate-cpu-server.py +++ b/tools/donate-cpu-server.py @@ -462,17 +462,24 @@ def server(server_address_port, packages, packageIndex, resultPath): # save data res = re.match(r'ftp://.*pool/main/[^/]+/([^/]+)/[^/]*tar.gz',url) - if res and url in packages: - print('results added for package ' + res.group(1)) - filename = resultPath + '/' + res.group(1) - 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)) + if res is None: + print('results not written. res is None.') + continue + if url not in packages: + url2 = url + '\n' + if url2 not in packages: + print('results not written. url is not in packages.') + continue + print('results added for package ' + res.group(1)) + filename = resultPath + '/' + res.group(1) + 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: print('[' + strDateTime() + '] invalid command: ' + firstLine) connection.close()