diff --git a/js_concurrent_module/worker/worker.cpp b/js_concurrent_module/worker/worker.cpp index b7317e31d80ae6d703ec47283a496f1f23d2b8a6..9d3056b097d6614dba97ecb861d08f73121912d6 100644 --- a/js_concurrent_module/worker/worker.cpp +++ b/js_concurrent_module/worker/worker.cpp @@ -1551,6 +1551,7 @@ bool Worker::PrepareForWorkerInstance() rawFileName = fileName_; } } + ApplyNameSetting(); // add timer interface Timer::RegisterTime(workerEnv_); napi_value execScriptResult = nullptr; @@ -1563,7 +1564,11 @@ bool Worker::PrepareForWorkerInstance() return false; } - ApplyNameSetting(); + if (!name_.empty()) { + napi_value nameValue = nullptr; + napi_create_string_utf8(workerEnv_, name_.c_str(), name_.length(), &nameValue); + NapiHelper::SetNamePropertyInGlobal(workerEnv_, "name", nameValue); + } return true; } @@ -1571,10 +1576,6 @@ void Worker::ApplyNameSetting() { std::string threadName = "WorkerThread"; if (!name_.empty()) { - napi_value nameValue = nullptr; - napi_create_string_utf8(workerEnv_, name_.c_str(), name_.length(), &nameValue); - NapiHelper::SetNamePropertyInGlobal(workerEnv_, "name", nameValue); - threadName += "_" + name_; if (threadName.length() > THREAD_NAME_MAX_LENGTH) { threadName = threadName.substr(0, THREAD_NAME_MAX_LENGTH);