Skip to content

[DO NOT MERGE] feat: add log type prefixes to the logs #1717

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

Closed
rigor789 wants to merge 1 commit into from
Closed

[DO NOT MERGE] feat: add log type prefixes to the logs #1717

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
16 changes: 8 additions & 8 deletions 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 @@ -43,9 +43,9 @@ v8::Local<v8::Object> Console::createConsole(v8::Local<v8::Context> context, Con
return console;
}

void Console::sendToADBLogcat(const std::string& message, android_LogPriority logPriority) {
void Console::sendToADBLogcat(const std::string& message, android_LogPriority logPriority, const std::string& logLevel) {
// limit the size of the message that we send to logcat using the predefined value in package.json
auto messageToLog = message;
auto messageToLog = "CONSOLE " + std::toupper(logLevel) + ": " + logLevelmessage;
if (messageToLog.length() > m_maxLogcatObjectSize) {
messageToLog = messageToLog.erase(m_maxLogcatObjectSize, std::string::npos);
messageToLog = messageToLog + "...";
Expand Down Expand Up @@ -189,7 +189,7 @@ void Console::assertCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
}

std::string log = assertionError.str();
sendToADBLogcat(log, ANDROID_LOG_ERROR);
sendToADBLogcat(log, ANDROID_LOG_ERROR, "error");
sendToDevToolsFrontEnd(isolate, log, "error");
}
} catch (NativeScriptException& e) {
Expand All @@ -212,7 +212,7 @@ void Console::errorCallback(const v8::FunctionCallbackInfo <v8::Value>& info) {
try {
std::string log = buildLogString(info);

sendToADBLogcat(log, ANDROID_LOG_ERROR);
sendToADBLogcat(log, ANDROID_LOG_ERROR, "error");
sendToDevToolsFrontEnd(info.GetIsolate(), log, "error");
} catch (NativeScriptException& e) {
e.ReThrowToV8();
Expand All @@ -234,7 +234,7 @@ void Console::infoCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
try {
std::string log = buildLogString(info);

sendToADBLogcat(log, ANDROID_LOG_INFO);
sendToADBLogcat(log, ANDROID_LOG_INFO, "info");
sendToDevToolsFrontEnd(info.GetIsolate(), log, "info");
} catch (NativeScriptException& e) {
e.ReThrowToV8();
Expand All @@ -256,7 +256,7 @@ void Console::logCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
try {
std::string log = buildLogString(info);

sendToADBLogcat(log, ANDROID_LOG_INFO);
sendToADBLogcat(log, ANDROID_LOG_INFO, "info");
sendToDevToolsFrontEnd(info.GetIsolate(), log, "info");
} catch (NativeScriptException& e) {
e.ReThrowToV8();
Expand All @@ -278,7 +278,7 @@ void Console::warnCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {
try {
std::string log = buildLogString(info);

sendToADBLogcat(log, ANDROID_LOG_WARN);
sendToADBLogcat(log, ANDROID_LOG_WARN, "warning");
sendToDevToolsFrontEnd(info.GetIsolate(), log, "warning");
} catch (NativeScriptException& e) {
e.ReThrowToV8();
Expand Down Expand Up @@ -357,7 +357,7 @@ void Console::dirCallback(const v8::FunctionCallbackInfo<v8::Value>& info) {

std::string log = ss.str();

sendToADBLogcat(log, ANDROID_LOG_INFO);
sendToADBLogcat(log, ANDROID_LOG_INFO, "info");
sendToDevToolsFrontEnd(isolate, log, "info");
} catch (NativeScriptException& e) {
e.ReThrowToV8();
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 @@ -59,7 +59,7 @@ class Console {
consoleInstance->CreateDataProperty(context, funcName, func);
}

static void sendToADBLogcat(const std::string& log, android_LogPriority logPriority);
static void sendToADBLogcat(const std::string& message, android_LogPriority logPriority, const std::string& logLevel);
static void sendToDevToolsFrontEnd(v8::Isolate* isolate, const std::string& message, const std::string& logLevel);
};

Expand Down