You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2019/05/28 08:13:52 UTC
[incubator-weex] branch master updated: [iOS] Avoid using os/log.h
because it is only supported on iOS9 and later. (#2486)
This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new 87783c6 [iOS] Avoid using os/log.h because it is only supported on iOS9 and later. (#2486)
87783c6 is described below
commit 87783c63424cd037435f822ca09b38e48e94d106
Author: wqyfavor <qi...@taobao.com>
AuthorDate: Tue May 28 16:13:47 2019 +0800
[iOS] Avoid using os/log.h because it is only supported on iOS9 and later. (#2486)
---
ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm | 12 ++++--------
weex_core/Source/base/log_defines.cpp | 10 ++++------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
index 4be6b9a..af0e318 100644
--- a/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
+++ b/ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm
@@ -52,10 +52,6 @@
#import <objc/runtime.h>
#include <fstream>
-#ifdef DEBUG
-#include <os/log.h>
-#endif
-
namespace WeexCore
{
static void consoleWithArguments(NSArray *arguments, WXLogFlag logLevel)
@@ -950,16 +946,16 @@ break; \
#ifdef DEBUG
switch (level) {
case LogLevel::Error:
- os_log_error(OS_LOG_DEFAULT, "<%s:Error|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
+ printf("<%s:Error|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
break;
case LogLevel::Warn:
- os_log_error(OS_LOG_DEFAULT, "<%s:Warn|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
+ printf("<%s:Warn|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
break;
case LogLevel::Info:
- os_log_info(OS_LOG_DEFAULT, "<%s:Info|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
+ printf("<%s:Info|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
break;
case LogLevel::Debug:
- os_log_debug(OS_LOG_DEFAULT, "<%s:Debug|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
+ printf("<%s:Debug|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log);
break;
default:
break;
diff --git a/weex_core/Source/base/log_defines.cpp b/weex_core/Source/base/log_defines.cpp
index 0b5968e..46ede78 100644
--- a/weex_core/Source/base/log_defines.cpp
+++ b/weex_core/Source/base/log_defines.cpp
@@ -23,8 +23,6 @@
#ifdef __ANDROID__
#include <android/log.h>
-#elif __APPLE__
-#include <os/log.h>
#endif
#include "core/manager/weex_core_manager.h"
@@ -106,16 +104,16 @@ namespace WeexCore {
#elif __APPLE__
switch (level) {
case LogLevel::Error:
- os_log_error(OS_LOG_DEFAULT, "<%s:Error|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
+ printf("<%s:Error|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
break;
case LogLevel::Warn:
- os_log_error(OS_LOG_DEFAULT, "<%s:Warn|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
+ printf("<%s:Warn|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
break;
case LogLevel::Info:
- os_log_info(OS_LOG_DEFAULT, "<%s:Info|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
+ printf("<%s:Info|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
break;
case LogLevel::Debug:
- os_log_debug(OS_LOG_DEFAULT, "<%s:Debug|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
+ printf("<%s:Debug|%s:%lu> %s\n", WEEX_CORE_LOG_TAG, file, line, log.str());
break;
default:
break;