Skip to content

Commit 80e6f70

Browse files
author
Nathan Lee
committed
Fixed errors with log handling and tickrate
1 parent cfc50cf commit 80e6f70

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

pyrunner/core/config.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,6 @@ def __setitem__(self, key, value):
164164
self._attr[key]['value'] = True
165165
else:
166166
self._attr[key]['value'] = self._attr[key]['type'](value)
167-
elif key == 'tickrate' and value < 1:
168-
self._attr['tickrate']['value'] = 1
169167
else:
170168
self._attr[key]['value'] = self._attr[key]['type'](value)
171169

pyrunner/core/engine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def initiate(self, **kwargs):
4949
signal_handler = SignalHandler(self.config)
5050
sys.path.append(self.config['worker_dir'])
5151
self.start_time = time.time()
52-
wait_interval = 1.0/self.config['tickrate'] if self.config['tickrate'] > 0 else 0
52+
wait_interval = 1.0/self.config['tickrate'] if self.config['tickrate'] >= 1 else 0
5353
last_save = 0
5454
ab_code = 0
5555

pyrunner/core/node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def poll(self, wait=False):
131131
logger.restart_message(self._attempts)
132132
self._retcode.value = -1
133133

134-
return self.retcode if not running or wait else None
134+
return self.retcode if (not running or wait) else None
135135

136136
def terminate(self):
137137
if self._thread.is_alive():

pyrunner/worker/abstract.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ def protected_run(self):
5757
methods, if defined.
5858
"""
5959

60-
sys.stdout = open(self.logfile, 'a')
61-
sys.stderr = open(self.logfile, 'a')
60+
if self.logfile:
61+
sys.stdout = open(self.logfile, 'a')
62+
sys.stderr = open(self.logfile, 'a')
6263

6364
# RUN
6465
try:
@@ -83,7 +84,7 @@ def protected_run(self):
8384
else:
8485
# ON FAIL
8586
try:
86-
self.retcode = self.on_fail() or self.retcode
87+
self.on_fail() or self.retcode
8788
except NotImplementedError:
8889
pass
8990
except Exception as e:

0 commit comments

Comments
 (0)