Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/common/system/crash_logs.py

Issue 2578213005: Use underscores to separate words in filenames in webkitpy. (Closed)
Patch Set: Fix check for attribute in output_capture.py. Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2011, Google Inc. All rights reserved. 1 # Copyright (c) 2011, Google Inc. All rights reserved.
2 # 2 #
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following disclaimer 10 # copyright notice, this list of conditions and the following disclaimer
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 def _log_directory_darwin(self): 42 def _log_directory_darwin(self):
43 log_directory = self._host.filesystem.expanduser("~") 43 log_directory = self._host.filesystem.expanduser("~")
44 log_directory = self._host.filesystem.join(log_directory, "Library", "Lo gs") 44 log_directory = self._host.filesystem.join(log_directory, "Library", "Lo gs")
45 if self._host.filesystem.exists(self._host.filesystem.join(log_directory , "DiagnosticReports")): 45 if self._host.filesystem.exists(self._host.filesystem.join(log_directory , "DiagnosticReports")):
46 log_directory = self._host.filesystem.join(log_directory, "Diagnosti cReports") 46 log_directory = self._host.filesystem.join(log_directory, "Diagnosti cReports")
47 else: 47 else:
48 log_directory = self._host.filesystem.join(log_directory, "CrashRepo rter") 48 log_directory = self._host.filesystem.join(log_directory, "CrashRepo rter")
49 return log_directory 49 return log_directory
50 50
51 def _find_newest_log_darwin(self, process_name, pid, include_errors, newer_t han): 51 def _find_newest_log_darwin(self, process_name, pid, include_errors, newer_t han):
52 def is_crash_log(fs, dirpath, basename): 52 def is_crash_log(basename):
53 return basename.startswith(process_name + "_") and basename.endswith (".crash") 53 return basename.startswith(process_name + "_") and basename.endswith (".crash")
54 54
55 log_directory = self._log_directory_darwin() 55 log_directory = self._log_directory_darwin()
56 logs = self._host.filesystem.files_under(log_directory, file_filter=is_c rash_log) 56 logs = self._host.filesystem.files_under(
57 log_directory,
58 file_filter=lambda fs, dirname, basename: is_crash_log(basename))
57 first_line_regex = re.compile(r'^Process:\s+(?P<process_name>.*) \[(?P<p id>\d+)\]$') 59 first_line_regex = re.compile(r'^Process:\s+(?P<process_name>.*) \[(?P<p id>\d+)\]$')
58 errors = '' 60 errors = ''
59 for path in reversed(sorted(logs)): 61 for path in reversed(sorted(logs)):
60 try: 62 try:
61 if not newer_than or self._host.filesystem.mtime(path) > newer_t han: 63 if not newer_than or self._host.filesystem.mtime(path) > newer_t han:
62 f = self._host.filesystem.read_text_file(path) 64 contents = self._host.filesystem.read_text_file(path)
63 match = first_line_regex.match(f[0:f.find('\n')]) 65 match = first_line_regex.match(contents[0:contents.find('\n' )])
64 if match and match.group('process_name') == process_name and (pid is None or int(match.group('pid')) == pid): 66 if match and match.group('process_name') == process_name and (pid is None or int(match.group('pid')) == pid):
65 return errors + f 67 return errors + contents
66 except IOError as e: 68 except IOError as error:
67 if include_errors: 69 if include_errors:
68 errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e) ) 70 errors += "ERROR: Failed to read '%s': %s\n" % (path, error)
69 except OSError as e: 71 except OSError as error:
70 if include_errors: 72 if include_errors:
71 errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e) ) 73 errors += "ERROR: Failed to read '%s': %s\n" % (path, error)
72 74
73 if include_errors and errors: 75 if include_errors and errors:
74 return errors 76 return errors
75 return None 77 return None
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698