walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

donate-cpu-server.py: Remove obsolete experimental "fast" code. 

Since the directory for the results does no longer exist on the server,
the server currently crashes every time older clients try to upload
experimental fast results via "write-fast" command.
Now this command is just ignored so the server is instantly ready
again after a "write-fast" command.
This commit is contained in:
versat 2019-03-29 12:52:27 +01:00
parent 36950d7d0d
commit a05cdadbf4
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tools/donate-cpu-server.py
View File

@ -17,7 +17,7 @@ import operator
# Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/ # Version scheme (MAJOR.MINOR.PATCH) should orientate on "Semantic Versioning" https://semver.org/
# Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic # Every change in this script should result in increasing the version number accordingly (exceptions may be cosmetic
# changes) # changes)
SERVER_VERSION = "1.1.0" SERVER_VERSION = "1.1.1"
OLD_VERSION = '1.87' OLD_VERSION = '1.87'
@ -765,8 +765,7 @@ def server(server_address_port, packages, packageIndex, resultPath):
print('[' + strDateTime() + '] get:' + pkg) print('[' + strDateTime() + '] get:' + pkg)
connection.send(pkg) connection.send(pkg)
connection.close() connection.close()
elif cmd.startswith('write\nftp://') or cmd.startswith('write-fast\nftp://'): elif cmd.startswith('write\nftp://'):
writeFast = cmd.startswith('write-fast')
# read data # read data
data = cmd[cmd.find('ftp'):] data = cmd[cmd.find('ftp'):]
try: try:
@ -800,38 +799,33 @@ def server(server_address_port, packages, packageIndex, resultPath):
if url2 not in packages: if url2 not in packages:
print('results not written. url is not in packages.') print('results not written. url is not in packages.')
continue continue
if not writeFast: # Verify that head was compared to correct OLD_VERSION
# Verify that head was compared to correct OLD_VERSION versions_found = False
versions_found = False old_version_wrong = False
old_version_wrong = False for line in data.split('\n', 20):
for line in data.split('\n', 20): if line.startswith('cppcheck: '):
if line.startswith('cppcheck: '): versions_found = True
versions_found = True if OLD_VERSION not in line.split():
if OLD_VERSION not in line.split(): print('Compared to wrong old version. Should be ' + OLD_VERSION + '. Versions compared: ' +
print('Compared to wrong old version. Should be ' + OLD_VERSION + '. Versions compared: ' + line)
line) print('Ignoring data.')
print('Ignoring data.') old_version_wrong = True
old_version_wrong = True break
break if not versions_found:
if not versions_found: print('Cppcheck versions missing in result data. Ignoring data.')
print('Cppcheck versions missing in result data. Ignoring data.') continue
continue if old_version_wrong:
if old_version_wrong: continue
continue
print('results added for package ' + res.group(1)) print('results added for package ' + res.group(1))
if writeFast: filename = resultPath + '/' + res.group(1)
filename = resultPath + '-fast/' + res.group(1)
else:
filename = resultPath + '/' + res.group(1)
with open(filename, 'wt') as f: with open(filename, 'wt') as f:
f.write(strDateTime() + '\n' + data) f.write(strDateTime() + '\n' + data)
# track latest added results.. # track latest added results..
if not writeFast: if len(latestResults) >= 20:
if len(latestResults) >= 20: latestResults = latestResults[1:]
latestResults = latestResults[1:] latestResults.append(filename)
latestResults.append(filename) with open('latest.txt', 'wt') as f:
with open('latest.txt', 'wt') as f: f.write(' '.join(latestResults))
f.write(' '.join(latestResults))
elif cmd.startswith('write_info\nftp://'): elif cmd.startswith('write_info\nftp://'):
# read data # read data
data = cmd[11:] data = cmd[11:]