| Index: build/android/adb_logcat_monitor.py
|
| diff --git a/build/android/adb_logcat_monitor.py b/build/android/adb_logcat_monitor.py
|
| index 0464b5303c1e04a422785260faf77553dd77fa9f..c69463ca0ad2f92f9535275caa351bb5e56e6e66 100755
|
| --- a/build/android/adb_logcat_monitor.py
|
| +++ b/build/android/adb_logcat_monitor.py
|
| @@ -94,17 +94,8 @@ def GetAttachedDevices(adb_cmd):
|
| signal.alarm(0)
|
|
|
|
|
| -def main(base_dir, adb_cmd='adb'):
|
| +def SpawnLogcatWatchers(base_dir, adb_cmd='adb'):
|
| """Monitor adb forever. Expects a SIGINT (Ctrl-C) to kill."""
|
| - # Spawn a detached child process.
|
| - pid = os.fork()
|
| - if pid > 0:
|
| - os._exit(os.EX_OK)
|
| - elif pid < 0:
|
| - sys.exit('Unable to spawn a detached child process.')
|
| - os.setsid()
|
| - # The rest happens in the child process.
|
| -
|
| # We create the directory to ensure 'run once' semantics
|
| if os.path.exists(base_dir):
|
| print 'adb_logcat_monitor: %s already exists? Cleaning' % base_dir
|
| @@ -160,6 +151,6 @@ def main(base_dir, adb_cmd='adb'):
|
| if __name__ == '__main__':
|
| if 2 <= len(sys.argv) <= 3:
|
| print 'adb_logcat_monitor: Initializing'
|
| - sys.exit(main(*sys.argv[1:3]))
|
| + sys.exit(SpawnLogcatWatchers(*sys.argv[1:3]))
|
|
|
| print 'Usage: %s <base_dir> [<adb_binary_path>]' % sys.argv[0]
|
|
|