firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correctly handle logging when devices are disconnected or logging processes otherwise crash.

Browse Source
This commit is contained in:
Ian Fischer 2015-09-03 10:30:57 -07:00
parent 5177b7d193
commit 1245aa7929
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
packages/flutter/lib/sky_tool
View File

@ -512,7 +512,12 @@ class AndroidDevice(object):
log_process = subprocess.Popen(cmd, bufsize=1, stdout=subprocess.PIPE) log_process = subprocess.Popen(cmd, bufsize=1, stdout=subprocess.PIPE)
while True: while True:
try: try:
sys.stdout.write('ANDROID: ' + log_process.stdout.readline()) log_line = log_process.stdout.readline()
if log_line == '':
if log_process.poll() != None:
logging.error('The Android logging process has quit unexpectedly. Please call the "logs" command again.')
break
sys.stdout.write('ANDROID: ' + log_line)
sys.stdout.flush() sys.stdout.flush()
except KeyboardInterrupt: except KeyboardInterrupt:
break break
@ -635,6 +640,10 @@ class IOSDevice(object):
while True: while True:
try: try:
log_line = log_process.stdout.readline() log_line = log_process.stdout.readline()
if log_line == '':
if log_process.poll() != None:
logging.error('The iOS logging process has quit unexpectedly. Please call the "logs" command again.')
break
if re.match(r'.*SkyShell.*', log_line) is not None: if re.match(r'.*SkyShell.*', log_line) is not None:
sys.stdout.write('IOS DEV: ' + log_line) sys.stdout.write('IOS DEV: ' + log_line)
sys.stdout.flush() sys.stdout.flush()
@ -757,6 +766,10 @@ class IOSSimulator(object):
while True: while True:
try: try:
log_line = log_process.stdout.readline() log_line = log_process.stdout.readline()
if log_line == '':
if log_process.poll() != None:
logging.error('The iOS Simulator logging process has quit unexpectedly. Please call the "logs" command again.')
break
if re.match(r'.*SkyShell.*', log_line) is not None: if re.match(r'.*SkyShell.*', log_line) is not None:
sys.stdout.write('IOS SIM: ' + log_line) sys.stdout.write('IOS SIM: ' + log_line)
sys.stdout.flush() sys.stdout.flush()