Skip to content

fix: console.log in worker should not crash app (#1511) #1513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2019
Merged

fix: console.log in worker should not crash app (#1511) #1513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions test-app/runtime/src/main/cpp/JsV8InspectorClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,11 @@ void JsV8InspectorClient::sendToFrontEndCallback(const v8::FunctionCallbackInfo<
}
}

void JsV8InspectorClient::consoleLogCallback(const string& message, const string& logLevel) {
void JsV8InspectorClient::consoleLogCallback(Isolate* isolate, const string& message, const string& logLevel) {
if (!inspectorIsConnected()) {
return;
}

auto isolate = Runtime::GetRuntime(0)->GetIsolate();
auto stack = v8::StackTrace::CurrentStackTrace(isolate, 1, v8::StackTrace::StackTraceOptions::kDetailed);

auto frame = stack->GetFrame(isolate, 0);
Expand Down
2 changes: 1 addition & 1 deletion test-app/runtime/src/main/cpp/JsV8InspectorClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class JsV8InspectorClient : V8InspectorClient, v8_inspector::V8Inspector::Channe
void flushProtocolNotifications() override;

static void sendToFrontEndCallback(const v8::FunctionCallbackInfo<v8::Value>& args);
static void consoleLogCallback(const std::string& message, const std::string& logLevel);
static void consoleLogCallback(v8::Isolate* isolate, const std::string& message, const std::string& logLevel);

void runMessageLoopOnPause(int context_group_id) override;
void quitMessageLoopOnPause() override;
Expand Down
2 changes: 1 addition & 1 deletion test-app/runtime/src/main/cpp/console/Console.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void Console::sendToADBLogcat(const std::string& message, android_LogPriority lo

void Console::sendToDevToolsFrontEnd(v8::Isolate* isolate, const std::string& message, const std::string& logLevel) {
if (m_callback != nullptr) {
m_callback(message, logLevel);
m_callback(isolate, message, logLevel);
}
}

Expand Down
2 changes: 1 addition & 1 deletion test-app/runtime/src/main/cpp/console/Console.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace tns {

typedef void (*ConsoleCallback)(const std::string& message, const std::string& logLevel);
typedef void (*ConsoleCallback)(v8::Isolate* isolate, const std::string& message, const std::string& logLevel);

class Console {
public:
Expand Down