| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2015 Google Inc. | 3 * Copyright 2015 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| 11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
| 12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
| 13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
| 14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
| 15 * | 15 * |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
| 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #import "ARDLogging.h" | 28 #import "RTCLogging.h" |
| 29 | 29 |
| 30 #include "webrtc/base/logging.h" | 30 #include "webrtc/base/logging.h" |
| 31 | 31 |
| 32 void ARDLogInit() { | 32 rtc::LoggingSeverity RTCGetNativeLoggingSeverity(RTCLoggingSeverity severity) { |
| 33 #ifndef _DEBUG | 33 switch (severity) { |
| 34 // In debug builds the default level is LS_INFO and in non-debug builds it is | 34 case kRTCLoggingSeverityVerbose: |
| 35 // disabled. Continue to log to console in non-debug builds, but only | 35 return rtc::LS_VERBOSE; |
| 36 // warnings and errors. | 36 case kRTCLoggingSeverityInfo: |
| 37 rtc::LogMessage::LogToDebug(rtc::LS_WARNING); | 37 return rtc::LS_INFO; |
| 38 #endif | 38 case kRTCLoggingSeverityWarning: |
| 39 } | 39 return rtc::LS_WARNING; |
| 40 | 40 case kRTCLoggingSeverityError: |
| 41 void ARDLogToWebRTCLogger(ARDLogSeverity severity, NSString *logString) { | 41 return rtc::LS_ERROR; |
| 42 if (logString.length) { | |
| 43 const char* utf8String = logString.UTF8String; | |
| 44 switch (severity) { | |
| 45 case kARDLogSeverityVerbose: | |
| 46 LOG(LS_VERBOSE) << utf8String; | |
| 47 break; | |
| 48 case kARDLogSeverityInfo: | |
| 49 LOG(LS_INFO) << utf8String; | |
| 50 break; | |
| 51 case kARDLogSeverityWarning: | |
| 52 LOG(LS_WARNING) << utf8String; | |
| 53 break; | |
| 54 case kARDLogSeverityError: | |
| 55 LOG(LS_ERROR) << utf8String; | |
| 56 break; | |
| 57 } | |
| 58 } | 42 } |
| 59 } | 43 } |
| 60 | 44 |
| 61 NSString *ARDFileName(const char *filePath) { | 45 void RTCLogEx(RTCLoggingSeverity severity, NSString* logString) { |
| 62 NSString *nsFilePath = | 46 if (logString.length) { |
| 63 [[NSString alloc] initWithBytesNoCopy:const_cast<char *>(filePath) | 47 const char* utf8String = logString.UTF8String; |
| 48 LOG_V(RTCGetNativeLoggingSeverity(severity)) << utf8String; |
| 49 } |
| 50 } |
| 51 |
| 52 void RTCSetMinDebugLogLevel(RTCLoggingSeverity severity) { |
| 53 rtc::LogMessage::LogToDebug(RTCGetNativeLoggingSeverity(severity)); |
| 54 } |
| 55 |
| 56 NSString* RTCFileName(const char* filePath) { |
| 57 NSString* nsFilePath = |
| 58 [[NSString alloc] initWithBytesNoCopy:const_cast<char*>(filePath) |
| 64 length:strlen(filePath) | 59 length:strlen(filePath) |
| 65 encoding:NSUTF8StringEncoding | 60 encoding:NSUTF8StringEncoding |
| 66 freeWhenDone:NO]; | 61 freeWhenDone:NO]; |
| 67 return nsFilePath.lastPathComponent; | 62 return nsFilePath.lastPathComponent; |
| 68 } | 63 } |
| 64 |
| OLD | NEW |