Logdog for logcats

build/android/pylib/local/device/local_device_environment.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import datetime
 import functools
 import logging
 import os
 import shutil
 import tempfile
 import threading
+import fileinput

[ghost stip (do not use), 2016/07/29 21:56:40]

nit: sort all system imports

[nicholaslin, 2016/07/29 23:54:06]

Done.

+import sys
 
 from devil import base_error
 from devil.android import device_blacklist
 from devil.android import device_errors
 from devil.android import device_list
 from devil.android import device_utils
 from devil.android import logcat_monitor
 from devil.utils import file_utils
 from devil.utils import parallelizer
 from pylib import constants
@@ skipping 159 matching lines @@
       with open(cache_path, 'w') as f:
         f.write(d.DumpCacheData())
         logging.info('Wrote device cache: %s', cache_path)
 
     self.parallel_devices.pMap(tear_down_device)
 
     for m in self._logcat_monitors:
       try:
         m.Stop()
         m.Close()
+        for line in fileinput.input([m.output_file], inplace=True):

[ghost stip (do not use), 2016/07/29 21:56:39]

cool! didn't know about fileinput

+          sys.stdout.write('Device(%s) %s' % (m.adb.GetDeviceSerial(), line))

[ghost stip (do not use), 2016/07/29 21:56:40]

does stdout work here? that is surprising

[nicholaslin, 2016/07/29 23:54:06]

From the local testing I did, yes. inplace=true moves input to a temporary file
and writes the stdout to the original file. 

       except base_error.BaseError:
         logging.exception('Failed to stop logcat monitor for %s',
                           m.adb.GetDeviceSerial())
 
     if self._logcat_output_file:
       file_utils.MergeFiles(
           self._logcat_output_file,
           [m.output_file for m in self._logcat_monitors])
       shutil.rmtree(self._logcat_output_dir)
 
   def BlacklistDevice(self, device, reason='local_device_failure'):
     device_serial = device.adb.GetDeviceSerial()
     if self._blacklist:
       self._blacklist.Extend([device_serial], reason=reason)
     with self._devices_lock:
       self._devices = [d for d in self._devices if str(d) != device_serial]