|
5 | 5 | #include "node_internals.h"
|
6 | 6 | #include "node_native_module_env.h"
|
7 | 7 | #include "node_platform.h"
|
8 |
| -#include "node_process.h" |
9 | 8 | #include "node_v8_platform-inl.h"
|
10 | 9 | #include "uv.h"
|
11 | 10 |
|
@@ -46,32 +45,6 @@ static bool ShouldAbortOnUncaughtException(Isolate* isolate) {
|
46 | 45 | !env->inside_should_not_abort_on_uncaught_scope();
|
47 | 46 | }
|
48 | 47 |
|
49 |
| -static void OnMessage(Local<Message> message, Local<Value> error) { |
50 |
| - Isolate* isolate = message->GetIsolate(); |
51 |
| - switch (message->ErrorLevel()) { |
52 |
| - case Isolate::MessageErrorLevel::kMessageWarning: { |
53 |
| - Environment* env = Environment::GetCurrent(isolate); |
54 |
| - if (!env) { |
55 |
| - break; |
56 |
| - } |
57 |
| - Utf8Value filename(isolate, message->GetScriptOrigin().ResourceName()); |
58 |
| - // (filename):(line) (message) |
59 |
| - std::stringstream warning; |
60 |
| - warning << *filename; |
61 |
| - warning << ":"; |
62 |
| - warning << message->GetLineNumber(env->context()).FromMaybe(-1); |
63 |
| - warning << " "; |
64 |
| - v8::String::Utf8Value msg(isolate, message->Get()); |
65 |
| - warning << *msg; |
66 |
| - USE(ProcessEmitWarningGeneric(env, warning.str().c_str(), "V8")); |
67 |
| - break; |
68 |
| - } |
69 |
| - case Isolate::MessageErrorLevel::kMessageError: |
70 |
| - FatalException(isolate, error, message); |
71 |
| - break; |
72 |
| - } |
73 |
| -} |
74 |
| - |
75 | 48 | void* NodeArrayBufferAllocator::Allocate(size_t size) {
|
76 | 49 | if (zero_fill_field_ || per_process::cli_options->zero_fill_all_buffers)
|
77 | 50 | return UncheckedCalloc(size);
|
@@ -187,7 +160,7 @@ void SetIsolateUpForNode(v8::Isolate* isolate, IsolateSettingCategories cat) {
|
187 | 160 | switch (cat) {
|
188 | 161 | case IsolateSettingCategories::kErrorHandlers:
|
189 | 162 | isolate->AddMessageListenerWithErrorLevel(
|
190 |
| - OnMessage, |
| 163 | + errors::PerIsolateMessageListener, |
191 | 164 | Isolate::MessageErrorLevel::kMessageError |
|
192 | 165 | Isolate::MessageErrorLevel::kMessageWarning);
|
193 | 166 | isolate->SetAbortOnUncaughtExceptionCallback(
|
|
0 commit comments