added speed to status infoline

This commit is contained in:
Richard Hartmann 2019-06-03 22:09:12 +02:00
parent 97bdd70d6f
commit 4b494f085b

View file

@ -1763,14 +1763,16 @@ class JobManager_Server(object):
if not self.hide_progress: if not self.hide_progress:
self.stat.start() self.stat.start()
old_bytes = self.result_q.get_bytes_recieved() bytes_recieved = self.result_q.get_bytes_recieved()
old_time = time.time() curr_time = time.time()
while numresults.value < numjobs.value: while numresults.value < numjobs.value:
numjobs.value = self.job_q.put_items() numjobs.value = self.job_q.put_items()
failqsize = self.fail_q.qsize() failqsize = self.fail_q.qsize()
jobqsize = self.job_q.qsize() jobqsize = self.job_q.qsize()
markeditems = self.job_q.marked_items() markeditems = self.job_q.marked_items()
numresults.value = failqsize + markeditems numresults.value = failqsize + markeditems
old_time = curr_time
old_bytes = bytes_recieved
bytes_recieved = self.result_q.get_bytes_recieved() bytes_recieved = self.result_q.get_bytes_recieved()
curr_time = time.time() curr_time = time.time()
data_speed = humanize_size((bytes_recieved - old_bytes) / (curr_time - old_time)) data_speed = humanize_size((bytes_recieved - old_bytes) / (curr_time - old_time))
@ -1797,8 +1799,6 @@ class JobManager_Server(object):
failqsize, failqsize,
numjobs.value - numresults.value - jobqsize).encode('utf-8') numjobs.value - numresults.value - jobqsize).encode('utf-8')
log.info("infoline {}".format(info_line.value)) log.info("infoline {}".format(info_line.value))
old_bytes = bytes_recieved
old_time = curr_time
# allows for update of the info line # allows for update of the info line
try: try:
arg, result = self.result_q.get(timeout=self.msg_interval) arg, result = self.result_q.get(timeout=self.msg_interval)