You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2013/12/04 01:25:21 UTC
[2/4] git commit: Cleaned up some log messages in the slave.
Cleaned up some log messages in the slave.
Review: https://reviews.apache.org/r/15951
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b9d604df
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b9d604df
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b9d604df
Branch: refs/heads/master
Commit: b9d604dfe986de1193911869d55382c1c264ebdc
Parents: 4173ec9
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Mon Dec 2 16:18:00 2013 -0800
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Tue Dec 3 14:20:08 2013 -0800
----------------------------------------------------------------------
src/slave/slave.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b9d604df/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index 91afe03..8b69da1 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -432,7 +432,7 @@ void Slave::shutdown(const UPID& from)
if (from && (!master.isSome() || from != master.get())) {
LOG(WARNING) << "Ignoring shutdown message from " << from
<< " because it is not from the registered master: "
- << (master.isSome() ? master.get() : "None/Error");
+ << (master.isSome() ? master.get() : "None");
return;
}
@@ -532,7 +532,7 @@ void Slave::registered(const UPID& from, const SlaveID& slaveId)
if (!master.isSome() || from != master.get()) {
LOG(WARNING) << "Ignoring registration message from " << from
<< " because it is not the expected master: "
- << (master.isSome() ? master.get() : "NONE/ERROR");
+ << (master.isSome() ? master.get() : "None");
return;
}
@@ -582,7 +582,7 @@ void Slave::reregistered(const UPID& from, const SlaveID& slaveId)
if (!master.isSome() || from != master.get()) {
LOG(WARNING) << "Ignoring re-registration message from " << from
<< " because it is not the expected master: "
- << (master.isSome() ? master.get() : "NONE/ERROR");
+ << (master.isSome() ? master.get() : "None");
return;
}
@@ -1115,7 +1115,7 @@ void Slave::shutdownFramework(
LOG(WARNING) << "Ignoring shutdown framework message for " << frameworkId
<< " from " << from
<< " because it is not from the registered master ("
- << (master.isSome() ? master.get() : "NONE/ERROR") << ")";
+ << (master.isSome() ? master.get() : "None") << ")";
return;
}