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

Unified Diff: chrome/browser/extensions/api/log_private/syslog_parser.cc

Issue 486873005: Update syslog parser for new ChromeOS log format (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@histograms
Patch Set: correct commit message, and simplify tests Created 6 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/api/log_private/syslog_parser_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/log_private/syslog_parser.cc
diff --git a/chrome/browser/extensions/api/log_private/syslog_parser.cc b/chrome/browser/extensions/api/log_private/syslog_parser.cc
index 4f26653554dc0458430c3f899f30155167adb8c3..d5915334194aabb8d8ab6e37258bf8acd60ae9ea 100644
--- a/chrome/browser/extensions/api/log_private/syslog_parser.cc
+++ b/chrome/browser/extensions/api/log_private/syslog_parser.cc
@@ -23,7 +23,7 @@ namespace extensions {
namespace {
-const char kProcessInfoDelimiters[] = "[]";
+const char kProcessInfoDelimiters[] = "[]:";
} // namespace
@@ -40,22 +40,16 @@ SyslogParser::Error SyslogParser::ParseEntry(
base::StringTokenizer tokenizer(input, " ");
if (!tokenizer.GetNext()) {
LOG(ERROR)
- << "Error when parsing data. Expect: At least 3 tokens. Actual: 0";
+ << "Error when parsing data. Expect: At least 2 tokens. Actual: 0";
return TOKENIZE_ERROR;
}
std::string time = tokenizer.token();
if (ParseTime(time, &(entry->timestamp)) != SyslogParser::SUCCESS) {
return SyslogParser::PARSE_ERROR;
}
- // Skips "localhost" field.
if (!tokenizer.GetNext()) {
LOG(ERROR)
- << "Error when parsing data. Expect: At least 3 tokens. Actual: 1";
- return TOKENIZE_ERROR;
- }
- if (!tokenizer.GetNext()) {
- LOG(ERROR)
- << "Error when parsing data. Expect: At least 3 tokens. Actual: 2";
+ << "Error when parsing data. Expect: At least 2 tokens. Actual: 1";
return TOKENIZE_ERROR;
}
ParseProcess(tokenizer.token(), entry.get());
« no previous file with comments | « no previous file | chrome/browser/extensions/api/log_private/syslog_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698