fix(core): fix log macro conflict for iOS

Tencent · Apr 27, 2022 · 5654164 · 5654164
1 parent 12022fb
commit 5654164
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/android/sdk/src/main/jni/src/bridge/entry.cc b/android/sdk/src/main/jni/src/bridge/entry.cc
@@ -148,10 +148,10 @@ bool RunScript(const std::shared_ptr<Runtime>& runtime,
                const unicode_string_view& uri,
                AAssetManager* asset_manager) {
   TDF_BASE_LOG(INFO) << "RunScript begin, file_name = " << file_name
-                      << ", is_use_code_cache = " << is_use_code_cache
-                      << ", code_cache_dir = " << code_cache_dir
-                      << ", uri = " << uri
-                      << ", asset_manager = " << asset_manager;
+                     << ", is_use_code_cache = " << is_use_code_cache
+                     << ", code_cache_dir = " << code_cache_dir
+                     << ", uri = " << uri
+                     << ", asset_manager = " << asset_manager;
   unicode_string_view script_content;
   bool read_script_flag;
   unicode_string_view code_cache_content;
@@ -423,7 +423,7 @@ jlong InitInstance(JNIEnv* j_env,
   engine_cb_map->insert(std::make_pair(hippy::base::kVMCreateCBKey, vm_cb));
 
   unicode_string_view global_config = JniUtils::JByteArrayToStrView(j_env, j_global_config);
-  TDF_BASE_LOG(DEBUG) << "global_config = " << global_config;
+  TDF_BASE_DLOG(INFO) << "global_config = " << global_config;
   std::shared_ptr<JavaScriptTask> task = std::make_shared<JavaScriptTask>();
   std::shared_ptr<JavaRef> save_object = std::make_shared<JavaRef>(j_env, j_callback);
 

diff --git a/android/sdk/src/main/jni/src/bridge/java2js.cc b/android/sdk/src/main/jni/src/bridge/java2js.cc
@@ -70,7 +70,7 @@ void CallFunction(JNIEnv* j_env,
                   jobject j_callback,
                   bytes buffer_data,
                   std::shared_ptr<JavaRef> buffer_owner) {
-  TDF_BASE_DLOG(DEBUG) << "CallFunction j_runtime_id = " << j_runtime_id;
+  TDF_BASE_DLOG(INFO) << "CallFunction j_runtime_id = " << j_runtime_id;
   auto runtime = Runtime::Find(hippy::base::checked_numeric_cast<jlong, int32_t>(j_runtime_id));
   if (!runtime) {
     TDF_BASE_DLOG(WARNING) << "CallFunction j_runtime_id invalid";

diff --git a/core/src/base/task_runner.cc b/core/src/base/task_runner.cc
@@ -62,7 +62,7 @@ void TaskRunner::Run() {
 void TaskRunner::Terminate() {
   {
     std::unique_lock<std::mutex> lock(mutex_);
-    TDF_BASE_DLOG(DEBUG) << "TaskRunner::Terminate task_queue_ size = " << task_queue_.size();
+    TDF_BASE_DLOG(INFO) << "TaskRunner::Terminate task_queue_ size = " << task_queue_.size();
     if (is_terminated_) {
       TDF_BASE_DLOG(INFO) << "TaskRunner has been terminated";
       return;
@@ -80,7 +80,7 @@ void TaskRunner::Terminate() {
 }
 
 void TaskRunner::PostTask(std::shared_ptr<Task> task) {
-  TDF_BASE_DLOG(DEBUG) << "TaskRunner::PostTask task id = " << task->id_;
+  TDF_BASE_DLOG(INFO) << "TaskRunner::PostTask task id = " << task->id_;
   std::lock_guard<std::mutex> lock(mutex_);
 
   PostTaskNoLock(std::move(task));

diff --git a/core/src/napi/v8/js_native_api_v8.cc b/core/src/napi/v8/js_native_api_v8.cc
@@ -937,13 +937,13 @@ std::shared_ptr<CtxValue> V8Ctx::CallFunction(
     }
   }
 
-  TDF_BASE_DLOG(DEBUG) << "v8 CallFunction call begin";
+  TDF_BASE_DLOG(INFO) << "v8 CallFunction call begin";
   v8::MaybeLocal<v8::Value> maybe_result = v8_fn->Call(
       context, context->Global(), static_cast<int>(argument_count), args);
-  TDF_BASE_DLOG(DEBUG) << "v8 CallFunction call end";
+  TDF_BASE_DLOG(INFO) << "v8 CallFunction call end";
 
   if (maybe_result.IsEmpty()) {
-    TDF_BASE_DLOG(DEBUG) << "maybe_result is empty";
+    TDF_BASE_DLOG(INFO) << "maybe_result is empty";
     return nullptr;
   }
   return std::make_shared<V8CtxValue>(isolate_, maybe_result.ToLocalChecked());

diff --git a/core/third_party/base/include/base/log_level.h b/core/third_party/base/include/base/log_level.h
@@ -8,8 +8,7 @@ namespace tdf {
 namespace base {
 
 enum LogSeverity: int32_t {
-  TDF_LOG_DEBUG = -1,
-  TDF_LOG_INFO = 0,
+  TDF_LOG_INFO,
   TDF_LOG_WARNING,
   TDF_LOG_ERROR,
   TDF_LOG_FATAL,

diff --git a/core/third_party/base/include/base/log_settings.h b/core/third_party/base/include/base/log_settings.h
@@ -10,7 +10,7 @@
 namespace tdf {
 namespace base {
 struct LogSettings {
-  LogSeverity min_log_level = TDF_LOG_DEBUG;
+  LogSeverity min_log_level = TDF_LOG_INFO;
 };
 
 void SetLogSettings(const LogSettings& settings);