leaner threading

This commit is contained in:
q
2013-11-09 10:17:02 +02:00
parent cd636fe4d7
commit 0fd0dc5a9f

View File

@@ -164,12 +164,14 @@ def print_stats(stats):
def print_activities(activities): def print_activities(activities):
''' Prints activity log ''' ''' Prints activity log '''
if activities != None: if activities != None:
activities.join()
for e,l in enumerate(activities.readstdout().strip().split('\n')): for e,l in enumerate(activities.readstdout().strip().split('\n')):
sys.stdout.write(pos(e+1,0)+l+CLRLN) sys.stdout.write(pos(e+1,0)+l+CLRLN)
else:
sys.stdout.write(pos(1,0)+'Recording activities..'+CLRLN)
try: try:
activities = Threaded("aerofs-sh activities -c 5") activities = Threaded("aerofs-sh activities -c 5")
activities.start() activities.start()
activities.join()
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
except TypeError: except TypeError:
@@ -235,9 +237,9 @@ sys.stdout.write(CLR+pos(0,0)+"Launching...")
transfers = Threaded("aerofs-sh transfers") transfers = Threaded("aerofs-sh transfers")
transfers.start() transfers.start()
activities = None
for e in range(5): for e in range(5):
sys.stdout.write(pos(e+1,0)+CLRLN) sys.stdout.write(pos(e+1,0)+CLRLN)
activities = print_activities(None)
while 1: while 1:
try: try: