OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 14 matching lines...) Expand all Loading... |
25 // TODO(ajm): SENSITIVE doesn't have a corresponding webrtc level. | 25 // TODO(ajm): SENSITIVE doesn't have a corresponding webrtc level. |
26 case LS_SENSITIVE: return kTraceInfo; | 26 case LS_SENSITIVE: return kTraceInfo; |
27 case LS_VERBOSE: return kTraceInfo; | 27 case LS_VERBOSE: return kTraceInfo; |
28 case LS_INFO: return kTraceTerseInfo; | 28 case LS_INFO: return kTraceTerseInfo; |
29 case LS_WARNING: return kTraceWarning; | 29 case LS_WARNING: return kTraceWarning; |
30 case LS_ERROR: return kTraceError; | 30 case LS_ERROR: return kTraceError; |
31 default: return kTraceNone; | 31 default: return kTraceNone; |
32 } | 32 } |
33 } | 33 } |
34 | 34 |
35 const char* DescribeFile(const char* file) { | 35 // Return the filename portion of the string (that following the last slash). |
| 36 const char* FilenameFromPath(const char* file) { |
36 const char* end1 = ::strrchr(file, '/'); | 37 const char* end1 = ::strrchr(file, '/'); |
37 const char* end2 = ::strrchr(file, '\\'); | 38 const char* end2 = ::strrchr(file, '\\'); |
38 if (!end1 && !end2) | 39 if (!end1 && !end2) |
39 return file; | 40 return file; |
40 else | 41 else |
41 return (end1 > end2) ? end1 + 1 : end2 + 1; | 42 return (end1 > end2) ? end1 + 1 : end2 + 1; |
42 } | 43 } |
43 | 44 |
44 } // namespace | 45 } // namespace |
45 | 46 |
46 LogMessage::LogMessage(const char* file, int line, LoggingSeverity sev) | 47 LogMessage::LogMessage(const char* file, int line, LoggingSeverity sev) |
47 : severity_(sev) { | 48 : severity_(sev) { |
48 print_stream_ << "(" << DescribeFile(file) << ":" << line << "): "; | 49 print_stream_ << "(" << FilenameFromPath(file) << ":" << line << "): "; |
49 } | 50 } |
50 | 51 |
51 bool LogMessage::Loggable(LoggingSeverity sev) { | 52 bool LogMessage::Loggable(LoggingSeverity sev) { |
52 // |level_filter| is a bitmask, unlike libjingle's minimum severity value. | 53 // |level_filter| is a bitmask, unlike libjingle's minimum severity value. |
53 return WebRtcSeverity(sev) & Trace::level_filter() ? true : false; | 54 return WebRtcSeverity(sev) & Trace::level_filter() ? true : false; |
54 } | 55 } |
55 | 56 |
56 LogMessage::~LogMessage() { | 57 LogMessage::~LogMessage() { |
57 const std::string& str = print_stream_.str(); | 58 const std::string& str = print_stream_.str(); |
58 Trace::Add(WebRtcSeverity(severity_), kTraceUndefined, 0, "%s", str.c_str()); | 59 Trace::Add(WebRtcSeverity(severity_), kTraceUndefined, 0, "%s", str.c_str()); |
59 } | 60 } |
60 | 61 |
61 } // namespace webrtc | 62 } // namespace webrtc |
OLD | NEW |