mirror of
https://github.com/servo/servo.git
synced 2025-07-22 14:53:49 +01:00
fixes #5232, more console log levels sent to devtools
This commit is contained in:
parent
54afa01dd6
commit
a00d264c8c
3 changed files with 54 additions and 40 deletions
|
@ -39,7 +39,7 @@ use actors::timeline::TimelineActor;
|
|||
use actors::worker::WorkerActor;
|
||||
use protocol::JsonPacketStream;
|
||||
|
||||
use devtools_traits::{ConsoleMessage, DevtoolsControlMsg, NetworkEvent};
|
||||
use devtools_traits::{ConsoleMessage, DevtoolsControlMsg, NetworkEvent, LogLevel};
|
||||
use devtools_traits::{DevtoolsPageInfo, DevtoolScriptControlMsg};
|
||||
use msg::constellation_msg::{PipelineId, WorkerId};
|
||||
use util::task::spawn_named;
|
||||
|
@ -251,29 +251,26 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
|
|||
let console_actor_name = find_console_actor(actors.clone(), id, actor_pipelines);
|
||||
let actors = actors.lock().unwrap();
|
||||
let console_actor = actors.find::<ConsoleActor>(&console_actor_name);
|
||||
match console_message {
|
||||
ConsoleMessage::LogMessage {
|
||||
message,
|
||||
filename,
|
||||
lineNumber,
|
||||
columnNumber,
|
||||
} => {
|
||||
let msg = ConsoleAPICall {
|
||||
from: console_actor.name.clone(),
|
||||
__type__: "consoleAPICall".to_string(),
|
||||
message: ConsoleMsg {
|
||||
level: "log".to_string(),
|
||||
timeStamp: precise_time_ns(),
|
||||
arguments: vec!(message),
|
||||
filename: filename,
|
||||
lineNumber: lineNumber,
|
||||
columnNumber: columnNumber,
|
||||
},
|
||||
};
|
||||
for stream in console_actor.streams.borrow_mut().iter_mut() {
|
||||
stream.write_json_packet(&msg);
|
||||
}
|
||||
}
|
||||
let msg = ConsoleAPICall {
|
||||
from: console_actor.name.clone(),
|
||||
__type__: "consoleAPICall".to_string(),
|
||||
message: ConsoleMsg {
|
||||
level: match console_message.logLevel {
|
||||
LogLevel::Debug => "debug",
|
||||
LogLevel::Info => "info",
|
||||
LogLevel::Warn => "warn",
|
||||
LogLevel::Error => "error",
|
||||
_ => "log"
|
||||
}.to_string(),
|
||||
timeStamp: precise_time_ns(),
|
||||
arguments: vec!(console_message.message),
|
||||
filename: console_message.filename,
|
||||
lineNumber: console_message.lineNumber,
|
||||
columnNumber: console_message.columnNumber,
|
||||
},
|
||||
};
|
||||
for stream in console_actor.streams.borrow_mut().iter_mut() {
|
||||
stream.write_json_packet(&msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue