Inherit appropiate environment variables in goma module for goma_utils.py

scripts/slave/goma_utils.py

 # Copyright (c) 2015 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.
 
 """Functions specific to handle goma related info.
 """
 
 import base64
 import datetime
 import getpass
@@ skipping 25 matching lines @@
 TIMESTAMP_FORMAT = '%Y/%m/%d %H:%M:%S'
 
 
 def GetShortHostname():
   """Get this machine's short hostname in lower case."""
   return socket.gethostname().split('.')[0].lower()
 
 
 def GetGomaTmpDirectory():
   """Get goma's temp directory."""
   candidates = ['GOMA_TMP_DIR', 'TEST_TMPDIR', 'TMPDIR', 'TMP']

[ukai, 2016/08/15 06:40:45]

GOMA_TMP_DIR, GLOG_log_dir, ..
if it matches with client/mypath.cc GetTempDirectory?

maybe, client/goma_ctl.py has the same issue.

or client/mypath.cc's GetTempDirectory should be fixed to ignore GLOG_log_dir?

[tikuta, 2016/08/15 08:35:28]

Removed GOMA_TMP_DIR that is not used for *.INFO files.

   for candidate in candidates:
     value = os.environ.get(candidate)
     if value and os.path.isdir(value):
       return value
   return '/tmp'
 
 
 def GetLatestGlogInfoFile(pattern):
   """Get a filename of the latest google glog INFO file.
 
   Args:
     pattern: a string of INFO file pattern.
 
   Returns:
     the latest glog INFO filename in fullpath.
   """
-  dirname = GetGomaTmpDirectory()
-  info_pattern = os.path.join(dirname, '%s.*.INFO.*' % pattern)
-  candidates = glob.glob(info_pattern)
-  if not candidates:
-    return None
-  return sorted(candidates, reverse=True)[0]
+  for dirname in [os.environ.get('GLOG_log_dir'),
+                  GetGomaTmpDirectory()]:
+    if not dirname:
+      continue
+    info_pattern = os.path.join(dirname, '%s.*.INFO.*' % pattern)
+    candidates = glob.glob(info_pattern)
+    if not candidates:
+      continue
+    return sorted(candidates, reverse=True)[0]
+
+  return None
 
 
 def GetLatestGomaCompilerProxyInfo():
   """Get a filename of the latest goma comiler_proxy.INFO."""
   return GetLatestGlogInfoFile('compiler_proxy')
 
 
 def GetLatestGomaCompilerProxySubprocInfo():
   """Get a filename of the latest goma comiler_proxy-subproc.INFO."""
   return GetLatestGlogInfoFile('compiler_proxy-subproc')
@@ skipping 269 matching lines @@
     retcode = chromium_utils.RunCommand(
       cmd, filter_obj=cmd_filter,
       max_time=30)
     if retcode:
       print('Execution of send_ts_mon_values failed with code %s'
             % retcode)
       print '\n'.join(cmd_filter.text)
 
   except Exception as ex:
     print('error while sending ts mon json_file=%s: %s' % (json_file, ex))