summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2016-03-22 09:29:08 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-22 16:30:02 +0000
commit07b3e034d356a9d3629a82041473d6db785a507d (patch)
treee48a636d1e8bc835ac22ec02abbb757e1245d3c7 /mojo
parent9b3bf41daf469e33cf6bae9ef6c13d6c213bedb8 (diff)
downloadchromium_src-07b3e034d356a9d3629a82041473d6db785a507d.zip
chromium_src-07b3e034d356a9d3629a82041473d6db785a507d.tar.gz
chromium_src-07b3e034d356a9d3629a82041473d6db785a507d.tar.bz2
Demote Mojo shell errors to warnings
Until we have application manifests sorted out in production these messages are too spammy to be errors. BUG=594419 R=jam@chromium.org Review URL: https://codereview.chromium.org/1824553004 Cr-Commit-Position: refs/heads/master@{#382583}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/shell/shell.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/mojo/shell/shell.cc b/mojo/shell/shell.cc
index 1fb16b6..c480e91 100644
--- a/mojo/shell/shell.cc
+++ b/mojo/shell/shell.cc
@@ -299,10 +299,10 @@ class Shell::Instance : public mojom::Connector,
const ConnectCallback& callback) {
if (!client_process_connection->is_null()) {
if (!HasClass(capability_spec_, kCapabilityClass_ClientProcess)) {
- LOG(ERROR) << "Error: Instance: " << identity_.name() << " attempting "
- << "to register an instance for a process it created for "
- << "target: " << target.name() << " without the "
- << "mojo:shell{client_process} capability class.";
+ LOG(WARNING) << "Instance: " << identity_.name() << " attempting "
+ << "to register an instance for a process it created for "
+ << "target: " << target.name() << " without the "
+ << "mojo:shell{client_process} capability class.";
callback.Run(mojom::ConnectResult::ACCESS_DENIED,
mojom::kInheritUserID, mojom::kInvalidInstanceID);
return false;
@@ -310,17 +310,17 @@ class Shell::Instance : public mojom::Connector,
if (!(*client_process_connection)->shell_client.is_valid() ||
!(*client_process_connection)->pid_receiver_request.is_valid()) {
- LOG(ERROR) << "Error: must supply both shell_client AND "
- << "pid_receiver_request when sending "
- << "client_process_connection.";
+ LOG(WARNING) << "Must supply both shell_client AND "
+ << "pid_receiver_request when sending "
+ << "client_process_connection.";
callback.Run(mojom::ConnectResult::INVALID_ARGUMENT,
mojom::kInheritUserID, mojom::kInvalidInstanceID);
return false;
}
if (shell_->GetExistingInstance(target)) {
- LOG(ERROR) << "Error: Cannot client process matching existing identity:"
- << "Name: " << target.name() << " User: " << target.user_id()
- << " Instance: " << target.instance();
+ LOG(WARNING) << "Cannot client process matching existing identity:"
+ << "Name: " << target.name() << " User: "
+ << target.user_id() << " Instance: " << target.instance();
callback.Run(mojom::ConnectResult::INVALID_ARGUMENT,
mojom::kInheritUserID, mojom::kInvalidInstanceID);
return false;