diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-15 12:22:26 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-15 12:22:26 -0700 |
commit | a5cd4b95183da4ae9b754d9d4824bd23f4ad7eb8 (patch) | |
tree | 5f2f34f706d4eb1290c3ed268492967ab8359afb /components/script_traits/lib.rs | |
parent | b382cc2103180f7dfd8df9c34970a95ed57a2d88 (diff) | |
parent | 44422744ff7f095998b07ded6af8fa0420417405 (diff) | |
download | servo-a5cd4b95183da4ae9b754d9d4824bd23f4ad7eb8.tar.gz servo-a5cd4b95183da4ae9b754d9d4824bd23f4ad7eb8.zip |
Auto merge of #11841 - asajeffrey:constellation-logging, r=Manishearth
Send log messages to the constellation
<!-- Please describe your changes on the following line: -->
Send all warnings and errors to the constellation. Warnings are bufferred up, and included in any subsequent error reports. Errors are reported in the same way as panics.
Note that this can't merge yet, as it needs https://github.com/rust-lang-nursery/log/pull/86 to land.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #11776 (github issue number if applicable).
- [X] These changes do not require tests because we don't test crash reporting.
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11841)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_traits/lib.rs')
-rw-r--r-- | components/script_traits/lib.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/components/script_traits/lib.rs b/components/script_traits/lib.rs index ab1a7d7ee52..967303e63b8 100644 --- a/components/script_traits/lib.rs +++ b/components/script_traits/lib.rs @@ -66,7 +66,7 @@ use url::Url; use util::ipc::OptionalOpaqueIpcSender; use webdriver_msg::{LoadStatus, WebDriverScriptCommand}; -pub use script_msg::{LayoutMsg, ScriptMsg, EventResult}; +pub use script_msg::{LayoutMsg, ScriptMsg, EventResult, LogEntry}; /// The address of a node. Layout sends these back. They must be validated via /// `from_untrusted_node_address` before they can be used, because we do not trust layout. @@ -436,6 +436,7 @@ pub enum MozBrowserEvent { /// handling `<menuitem>` element available within the browser `<iframe>`'s content. ContextMenu, /// Sent when an error occurred while trying to load content within a browser `<iframe>`. + /// Includes an optional human-readable description, and an optional machine-readable report. Error(MozBrowserErrorType, Option<String>, Option<String>), /// Sent when the favicon of a browser `<iframe>` changes. IconChange(String, String, String), @@ -599,4 +600,6 @@ pub enum ConstellationMsg { WebDriverCommand(WebDriverCommandMsg), /// Reload the current page. Reload, + /// A log entry, with the pipeline id and thread name + LogEntry(Option<PipelineId>, Option<String>, LogEntry), } |