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

Side by Side 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, 3 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/log_private/syslog_parser.h" 5 #include "chrome/browser/extensions/api/log_private/syslog_parser.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/linked_ptr.h" 11 #include "base/memory/linked_ptr.h"
12 #include "base/memory/singleton.h" 12 #include "base/memory/singleton.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_split.h" 14 #include "base/strings/string_split.h"
15 #include "base/strings/string_tokenizer.h" 15 #include "base/strings/string_tokenizer.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "chrome/browser/extensions/api/log_private/filter_handler.h" 17 #include "chrome/browser/extensions/api/log_private/filter_handler.h"
18 #include "chrome/browser/extensions/api/log_private/log_parser.h" 18 #include "chrome/browser/extensions/api/log_private/log_parser.h"
19 #include "chrome/browser/extensions/api/log_private/log_private_api.h" 19 #include "chrome/browser/extensions/api/log_private/log_private_api.h"
20 #include "chrome/common/extensions/api/log_private.h" 20 #include "chrome/common/extensions/api/log_private.h"
21 21
22 namespace extensions { 22 namespace extensions {
23 23
24 namespace { 24 namespace {
25 25
26 const char kProcessInfoDelimiters[] = "[]"; 26 const char kProcessInfoDelimiters[] = "[]:";
27 27
28 } // namespace 28 } // namespace
29 29
30 SyslogParser::SyslogParser() {} 30 SyslogParser::SyslogParser() {}
31 31
32 SyslogParser::~SyslogParser() {} 32 SyslogParser::~SyslogParser() {}
33 33
34 SyslogParser::Error SyslogParser::ParseEntry( 34 SyslogParser::Error SyslogParser::ParseEntry(
35 const std::string& input, 35 const std::string& input,
36 std::vector<linked_ptr<api::log_private::LogEntry> >* output, 36 std::vector<linked_ptr<api::log_private::LogEntry> >* output,
37 FilterHandler* filter_handler) const { 37 FilterHandler* filter_handler) const {
38 linked_ptr<api::log_private::LogEntry> entry(new api::log_private::LogEntry); 38 linked_ptr<api::log_private::LogEntry> entry(new api::log_private::LogEntry);
39 39
40 base::StringTokenizer tokenizer(input, " "); 40 base::StringTokenizer tokenizer(input, " ");
41 if (!tokenizer.GetNext()) { 41 if (!tokenizer.GetNext()) {
42 LOG(ERROR) 42 LOG(ERROR)
43 << "Error when parsing data. Expect: At least 3 tokens. Actual: 0"; 43 << "Error when parsing data. Expect: At least 2 tokens. Actual: 0";
44 return TOKENIZE_ERROR; 44 return TOKENIZE_ERROR;
45 } 45 }
46 std::string time = tokenizer.token(); 46 std::string time = tokenizer.token();
47 if (ParseTime(time, &(entry->timestamp)) != SyslogParser::SUCCESS) { 47 if (ParseTime(time, &(entry->timestamp)) != SyslogParser::SUCCESS) {
48 return SyslogParser::PARSE_ERROR; 48 return SyslogParser::PARSE_ERROR;
49 } 49 }
50 // Skips "localhost" field.
51 if (!tokenizer.GetNext()) { 50 if (!tokenizer.GetNext()) {
52 LOG(ERROR) 51 LOG(ERROR)
53 << "Error when parsing data. Expect: At least 3 tokens. Actual: 1"; 52 << "Error when parsing data. Expect: At least 2 tokens. Actual: 1";
54 return TOKENIZE_ERROR;
55 }
56 if (!tokenizer.GetNext()) {
57 LOG(ERROR)
58 << "Error when parsing data. Expect: At least 3 tokens. Actual: 2";
59 return TOKENIZE_ERROR; 53 return TOKENIZE_ERROR;
60 } 54 }
61 ParseProcess(tokenizer.token(), entry.get()); 55 ParseProcess(tokenizer.token(), entry.get());
62 ParseLevel(input, entry.get()); 56 ParseLevel(input, entry.get());
63 entry->full_entry = input; 57 entry->full_entry = input;
64 58
65 if (filter_handler->IsValidLogEntry(*(entry.get()))) { 59 if (filter_handler->IsValidLogEntry(*(entry.get()))) {
66 output->push_back(entry); 60 output->push_back(entry);
67 } 61 }
68 62
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 } else if (input.find("WARN") != std::string::npos) { 103 } else if (input.find("WARN") != std::string::npos) {
110 entry->level = "warning"; 104 entry->level = "warning";
111 } else if (input.find("INFO") != std::string::npos) { 105 } else if (input.find("INFO") != std::string::npos) {
112 entry->level = "info"; 106 entry->level = "info";
113 } else { 107 } else {
114 entry->level = "unknown"; 108 entry->level = "unknown";
115 } 109 }
116 } 110 }
117 111
118 } // namespace extensions 112 } // namespace extensions
OLDNEW
« 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