Skip to content

fixed #12672 / refs #12671 - donate-cpu-server.py: increased buffers for data reading / some minor fixes #6358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrchr-github merged 4 commits into from
Apr 29, 2024
Merged

fixed #12672 / refs #12671 - donate-cpu-server.py: increased buffers for data reading / some minor fixes #6358

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9398f8e
donate-cpu-server.py: bumped version
firewave Apr 28, 2024
db0ebc2
donate-cpu-server.py: decode data as ascii in `read_data` as that is …
firewave Apr 28, 2024
0d6c14a
fixed #12672 - donate-cpu-server.py: corrected the condition for the …
firewave Apr 28, 2024
d35160c
refs #12671 - donate-cpu-server.py: increased the maximum allowed dat…
firewave Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions tools/donate-cpu-server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# 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
# changes)
SERVER_VERSION = "1.3.50"
SERVER_VERSION = "1.3.51"

OLD_VERSION = '2.14.0'

Expand Down Expand Up @@ -1221,7 +1221,7 @@ def read_data(connection, cmd, pos_nl, max_data_size, check_done, cmd_name, time
bytes_received = connection.recv(1024)
if bytes_received:
try:
text_received = bytes_received.decode('utf-8', 'ignore')
text_received = bytes_received.decode('ascii', 'ignore')
except UnicodeDecodeError as e:
print_ts('Error: Decoding failed ({}): {}'.format(cmd_name, e))
data = None
Expand All @@ -1243,7 +1243,7 @@ def read_data(connection, cmd, pos_nl, max_data_size, check_done, cmd_name, time
print_ts('Timeout occurred ({}).'.format(cmd_name))
data = None

if data and (len(data) >= (max_data_size + 1024)):
if data and (len(data) >= max_data_size):
print_ts('Maximum allowed data ({} bytes) exceeded ({}).'.format(max_data_size, cmd_name))
data = None

Expand Down Expand Up @@ -1321,7 +1321,7 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
connection.close()
continue
elif cmd.startswith('write\nftp://') or cmd.startswith('write\nhttp://'):
data = read_data(connection, cmd, pos_nl, max_data_size=2 * 1024 * 1024, check_done=True, cmd_name='write')
data = read_data(connection, cmd, pos_nl, max_data_size=2.5 * 1024 * 1024, check_done=True, cmd_name='write')
if data is None:
continue

Expand Down Expand Up @@ -1376,7 +1376,7 @@ def server(server_address_port: int, packages: list, packageIndex: int, resultPa
generate_package_diff_statistics(filename)
continue
elif cmd.startswith('write_info\nftp://') or cmd.startswith('write_info\nhttp://'):
data = read_data(connection, cmd, pos_nl, max_data_size=1024 * 1024, check_done=True, cmd_name='write_info')
data = read_data(connection, cmd, pos_nl, max_data_size=7 * 1024 * 1024, check_done=True, cmd_name='write_info')
if data is None:
continue

Expand Down