From 23821f9f0843a2ef14b6a7b15b0a4b3cda6afedd Mon Sep 17 00:00:00 2001 From: darin Date: Wed, 4 Sep 2019 11:39:20 +0800 Subject: [PATCH] Change some error level log to debug level (#2877) --- .../sdk/src/main/java/com/taobao/weex/WXEnvironment.java | 6 +++--- .../sdk/src/main/java/com/taobao/weex/WXHttpListener.java | 6 +++--- .../sdk/src/main/java/com/taobao/weex/WXSDKEngine.java | 2 +- .../sdk/src/main/java/com/taobao/weex/WXSDKInstance.java | 2 +- .../src/main/java/com/taobao/weex/bridge/WXBridge.java | 2 +- .../java/com/taobao/weex/performance/WXInstanceApm.java | 6 +++--- weex_core/Source/android/bridge/multi_so_initializer.cpp | 2 +- .../android/bridge/script_bridge_in_multi_process.cpp | 4 ++-- .../jsengine/bridge/script/script_side_in_queue.cpp | 8 ++++---- weex_core/Source/android/jsengine/task/timer_queue.cpp | 4 ++-- weex_core/Source/android/jsengine/weex_runtime.cpp | 4 ++-- .../Source/android/multiprocess/weex_js_connection.cpp | 8 ++++---- weex_core/Source/android/utils/params_utils.cpp | 4 ++-- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java index daa1c3e039..9d3250d6a8 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java @@ -605,13 +605,13 @@ public static String getLibJScRealPath() { public static String getLibJssRealPath() { if (WXEnvironment.sUseRunTimeApi && !TextUtils.isEmpty(CORE_JSS_RUNTIME_SO_PATH)){ - WXLogUtils.e("test-> findLibJssRuntimeRealPath " + CORE_JSS_RUNTIME_SO_PATH); + WXLogUtils.d("test-> findLibJssRuntimeRealPath " + CORE_JSS_RUNTIME_SO_PATH); return CORE_JSS_RUNTIME_SO_PATH; } if(TextUtils.isEmpty(CORE_JSS_SO_PATH)) { CORE_JSS_SO_PATH = findSoPath(CORE_JSS_SO_NAME); - WXLogUtils.e("test-> findLibJssRealPath " + CORE_JSS_SO_PATH); + WXLogUtils.d("test-> findLibJssRealPath " + CORE_JSS_SO_PATH); } return CORE_JSS_SO_PATH; @@ -652,7 +652,7 @@ public static String getLibLdPath() { } } - WXLogUtils.e("getLibLdPath is " + LIB_LD_PATH); + WXLogUtils.d("getLibLdPath is " + LIB_LD_PATH); return LIB_LD_PATH; } diff --git a/android/sdk/src/main/java/com/taobao/weex/WXHttpListener.java b/android/sdk/src/main/java/com/taobao/weex/WXHttpListener.java index d2ffd0970d..15d9cf2f7d 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXHttpListener.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXHttpListener.java @@ -219,10 +219,10 @@ public void onHttpFinish(WXResponse response) { if (isPreDownLoadMode){ if (isInstanceReady){ - WXLogUtils.e("test->", "DownLoad didHttpFinish on http" ); + WXLogUtils.d("test->", "DownLoad didHttpFinish on http" ); didHttpFinish(response); }else { - WXLogUtils.e("test->", "DownLoad end before activity created" ); + WXLogUtils.d("test->", "DownLoad end before activity created" ); mResponse = response; isResponseHasWait = true; } @@ -238,7 +238,7 @@ public void onInstanceReady(){ } this.isInstanceReady = true; if (isResponseHasWait){ - WXLogUtils.e("test->", "preDownLoad didHttpFinish on ready" ); + WXLogUtils.d("test->", "preDownLoad didHttpFinish on ready" ); this.didHttpFinish(mResponse); } diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java index 959eab3f79..d9ef52265f 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKEngine.java @@ -167,7 +167,7 @@ public static void initialize(Application application,InitConfig config){ long start = System.currentTimeMillis(); WXEnvironment.sSDKInitStart = start; if(WXEnvironment.isApkDebugable(application)){ - WXEnvironment.sLogLevel = LogLevel.INFO; + WXEnvironment.sLogLevel = LogLevel.DEBUG; }else{ WXEnvironment.sLogLevel = LogLevel.WARN; } diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java index 17f4cece9d..bb283095f3 100644 --- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java +++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java @@ -785,7 +785,7 @@ public boolean isPreDownLoad(){ } public void onInstanceReady(){ - WXLogUtils.e("test->","onInstanceReady"); + WXLogUtils.d("test->","onInstanceReady"); mApmForInstance.onStage(WXInstanceApm.KEY_PAGE_STAGES_CONTAINER_READY); if (!isPreInit && !isPreDownLoad){ return; diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java index aa38a262b1..134d5ec4ad 100755 --- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java +++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridge.java @@ -884,7 +884,7 @@ public void reportNativeInitStatus(String statusCode, String errorMsg) { params.put(IWXUserTrackAdapter.MONITOR_ERROR_CODE, statusCode); params.put(IWXUserTrackAdapter.MONITOR_ARG, "InitFrameworkNativeError"); params.put(IWXUserTrackAdapter.MONITOR_ERROR_MSG, errorMsg); - Log.e("Dyy", "reportNativeInitStatus is running and errorCode is " + statusCode + " And errorMsg is " + errorMsg); + WXLogUtils.e("reportNativeInitStatus is running and errorCode is " + statusCode + " And errorMsg is " + errorMsg); userTrackAdapter.commit(null, null, IWXUserTrackAdapter.INIT_FRAMEWORK, null, params); } diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java b/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java index d75e271d58..12a09f1f5c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java +++ b/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java @@ -418,13 +418,13 @@ private void printLog(){ Long interaction = stageMap.get(KEY_PAGE_STAGES_INTERACTION); Long containerReady = stageMap.get(KEY_PAGE_STAGES_CONTAINER_READY); if (null != endDownLoad && null != startDownLoad){ - WXLogUtils.e("test->", "downLoadTime: "+ (endDownLoad - startDownLoad)); + WXLogUtils.d("test->", "downLoadTime: "+ (endDownLoad - startDownLoad)); } if (null != endDownLoad && null != interaction){ - WXLogUtils.e("test->", "renderTime: "+ (interaction - endDownLoad)); + WXLogUtils.d("test->", "renderTime: "+ (interaction - endDownLoad)); } if (null != containerReady && null !=interaction){ - WXLogUtils.e("test->", "showTime: "+ (interaction - containerReady)); + WXLogUtils.d("test->", "showTime: "+ (interaction - containerReady)); } } diff --git a/weex_core/Source/android/bridge/multi_so_initializer.cpp b/weex_core/Source/android/bridge/multi_so_initializer.cpp index 7014f3ddaf..de463ebc61 100644 --- a/weex_core/Source/android/bridge/multi_so_initializer.cpp +++ b/weex_core/Source/android/bridge/multi_so_initializer.cpp @@ -43,7 +43,7 @@ bool MultiSoInitializer::Init( soPath = SoUtils::FindLibJssSoPath(); } - LOGE("final executablePath:%s", soPath.c_str()); + LOGD("final executablePath:%s", soPath.c_str()); SoUtils::updateSoLinkPath(SoUtils::lib_ld_path()); void *handle = dlopen(soPath.c_str(), RTLD_NOW); if (!handle) { diff --git a/weex_core/Source/android/bridge/script_bridge_in_multi_process.cpp b/weex_core/Source/android/bridge/script_bridge_in_multi_process.cpp index 7cc4ec6eff..4a3dbff1e9 100644 --- a/weex_core/Source/android/bridge/script_bridge_in_multi_process.cpp +++ b/weex_core/Source/android/bridge/script_bridge_in_multi_process.cpp @@ -1001,14 +1001,14 @@ ScriptBridgeInMultiProcess::ScriptBridgeInMultiProcess() { std::unique_ptr initializer( new MultiProcessAndSoInitializer); - LOGE("ScriptBridgeInMultiProcess"); + LOGD("ScriptBridgeInMultiProcess"); bool passable = initializer->Init( [this](IPCHandler *handler) { RegisterIPCCallback(handler); }, [this](std::unique_ptr connection) { static_cast(script_side()) ->set_sender(connection->sender()); connection_ = std::move(connection); - LOGE("ScriptBridgeInMultiProcess finish"); + LOGD("ScriptBridgeInMultiProcess finish"); return true; }, [this](const char *page_id, const char *func, diff --git a/weex_core/Source/android/jsengine/bridge/script/script_side_in_queue.cpp b/weex_core/Source/android/jsengine/bridge/script/script_side_in_queue.cpp index ea0f6aca18..67054ea0eb 100644 --- a/weex_core/Source/android/jsengine/bridge/script/script_side_in_queue.cpp +++ b/weex_core/Source/android/jsengine/bridge/script/script_side_in_queue.cpp @@ -58,7 +58,7 @@ int ScriptSideInQueue::InitFramework( if(WeexEnv::getEnv()->can_m_cache_task_()) { WeexEnv::getEnv()->m_task_cache_.push_back(new InitFrameworkTask(String::fromUTF8(script), params)); - LOGE("cache initFramework %d", WeexEnv::getEnv()->m_task_cache_.size()); + LOGD("cache initFramework %d", WeexEnv::getEnv()->m_task_cache_.size()); } else { weexTaskQueue_bk_ = new WeexTaskQueue(weexTaskQueue_->isMultiProgress); weexTaskQueue_bk_->addTask(new InitFrameworkTask(String::fromUTF8(script), params)); @@ -136,7 +136,7 @@ int ScriptSideInQueue::ExecJsService(const char *source) { ExeJsServicesTask *task = new ExeJsServicesTask(String::fromUTF8(source)); if(WeexEnv::getEnv()->can_m_cache_task_() && weexTaskQueue_bk_ == nullptr){ WeexEnv::getEnv()->m_task_cache_.push_back(task); - LOGE("cache ExecJsService %d", WeexEnv::getEnv()->m_task_cache_.size()); + LOGD("cache ExecJsService %d", WeexEnv::getEnv()->m_task_cache_.size()); } else { weexTaskQueue_bk_->addTask(task); } @@ -171,7 +171,7 @@ int ScriptSideInQueue::ExecJS(const char *instanceId, const char *nameSpace, if (WeexEnv::getEnv()->enableBackupThread()) { if(WeexEnv::getEnv()->can_m_cache_task_() && weexTaskQueue_bk_ == nullptr){ WeexEnv::getEnv()->m_task_cache_.push_back(task->clone()); - LOGE("cache ExecJS %d", WeexEnv::getEnv()->m_task_cache_.size()); + LOGD("cache ExecJS %d", WeexEnv::getEnv()->m_task_cache_.size()); } else { weexTaskQueue_bk_->addTask(task->clone()); } @@ -278,7 +278,7 @@ std::unique_ptr ScriptSideInQueue::ExecJSOnInstance(const char *in //don't need wait. just run js. std::unique_ptr returnResult; returnResult.reset(new WeexJSResult()); - LOGE("test-> return default result"); + LOGD("test-> return default result"); return returnResult; } auto future = std::unique_ptr(new WeexTask::Future()); diff --git a/weex_core/Source/android/jsengine/task/timer_queue.cpp b/weex_core/Source/android/jsengine/task/timer_queue.cpp index 38a9a8cfce..f4a7acab24 100644 --- a/weex_core/Source/android/jsengine/task/timer_queue.cpp +++ b/weex_core/Source/android/jsengine/task/timer_queue.cpp @@ -44,12 +44,12 @@ void TimerQueue::init() { void TimerQueue::start() { while (true) { auto pTask = getTask(); - LOGE("getTask return task"); + LOGD("getTask return task"); if(pTask->global_object_ != nullptr && weexTaskQueue->weexRuntime->hasInstanceId(pTask->instanceID)) { weexTaskQueue->addTimerTask(pTask->instanceID, pTask->m_function, pTask->taskId,pTask->global_object_, !pTask->repeat); if (pTask->repeat && pTask->global_object_ != nullptr && weexTaskQueue->weexRuntime->hasInstanceId(pTask->instanceID)) { - LOGE("repreat"); + LOGD("repreat"); addTimerTask(new TimerTask(pTask)); } } diff --git a/weex_core/Source/android/jsengine/weex_runtime.cpp b/weex_core/Source/android/jsengine/weex_runtime.cpp index eb1b3dd6c9..5468834802 100644 --- a/weex_core/Source/android/jsengine/weex_runtime.cpp +++ b/weex_core/Source/android/jsengine/weex_runtime.cpp @@ -493,7 +493,7 @@ void WeexRuntime::exeJSWithCallback(const String &instanceId, const String &name } std::unique_ptr WeexRuntime::exeJSOnInstance(const String &instanceId, const String &script) { - LOGE("test-> [runtime] beofore exeJSOnInstance"); + LOGD("test-> [runtime] beofore exeJSOnInstance"); std::unique_ptr returnResult; returnResult.reset(new WeexJSResult); @@ -526,7 +526,7 @@ std::unique_ptr WeexRuntime::exeJSOnInstance(const String &instanc char *buf = new char[returnResult->length + 1]; strcpy(buf, data); returnResult->data.reset(buf); - LOGE("test-> [runtime] end exeJSOnInstance"); + LOGD("test-> [runtime] end exeJSOnInstance"); return returnResult; } diff --git a/weex_core/Source/android/multiprocess/weex_js_connection.cpp b/weex_core/Source/android/multiprocess/weex_js_connection.cpp index e4aefa84a4..e708d15a31 100644 --- a/weex_core/Source/android/multiprocess/weex_js_connection.cpp +++ b/weex_core/Source/android/multiprocess/weex_js_connection.cpp @@ -334,11 +334,11 @@ static void findIcuDataPath(std::string &icuDataPath) { fseek(f,0L,SEEK_END); int size=ftell(f); - LOGE("file size is %d",size); + LOGD("file size is %d",size); struct stat statbuf; stat("/proc/self/maps",&statbuf); int size1=statbuf.st_size; - LOGE("file size1 is %d",size1); + LOGD("file size1 is %d",size1); char buffer[256]; char *line; while ((line = fgets(buffer, 256, f))) { @@ -401,7 +401,7 @@ void doExec(int fdClient, int fdServer, bool traceEnable, bool startupPie) { std::string executablePath; std::string icuDataPath; if(SoUtils::jss_icu_path() != nullptr) { - LOGE("jss_icu_path not null %s",SoUtils::jss_icu_path()); + LOGD("jss_icu_path not null %s",SoUtils::jss_icu_path()); icuDataPath = SoUtils::jss_icu_path(); } else { s_in_find_icu = true; @@ -529,7 +529,7 @@ void doExec(int fdClient, int fdServer, bool traceEnable, bool startupPie) { const char *argv[] = {executableName.c_str(), fdStr, fdServerStr, traceEnable ? "1" : "0", g_crashFileName.c_str(), nullptr}; if (-1 == execve(argv[0], const_cast(&argv[0]), const_cast(envp.get()))) { - LOGE("bbbbbbbbbbbb execve failed errno %s \n", strerror(errno)); + LOGE("execve failed errno %s \n", strerror(errno)); #if PRINT_LOG_CACHEFILE mcfile << "execve failed:" << strerror(errno) << std::endl; #endif diff --git a/weex_core/Source/android/utils/params_utils.cpp b/weex_core/Source/android/utils/params_utils.cpp index e79ed1a8d9..5c8d05f0ee 100644 --- a/weex_core/Source/android/utils/params_utils.cpp +++ b/weex_core/Source/android/utils/params_utils.cpp @@ -280,7 +280,7 @@ std::vector initFromParam( if (j_get_jsb_so_path != nullptr) { SoUtils::set_jsb_so_path(const_cast( env->GetStringUTFChars((jstring)(j_get_jsb_so_path), nullptr))); - LOGE("g_jsbSoPath is %s ", SoUtils::jsb_so_path()); + LOGD("g_jsbSoPath is %s ", SoUtils::jsb_so_path()); env->DeleteLocalRef(j_get_jsb_so_path); } } @@ -294,7 +294,7 @@ std::vector initFromParam( if (j_get_lib_ld_path != nullptr) { SoUtils::set_lib_ld_path(const_cast( env->GetStringUTFChars((jstring)(j_get_lib_ld_path), nullptr))); - LOGE("lib_ld_path is %s ", SoUtils::lib_ld_path()); + LOGD("lib_ld_path is %s ", SoUtils::lib_ld_path()); env->DeleteLocalRef(j_get_lib_ld_path); } }