You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/10/24 22:51:30 UTC
[9/9] git commit: SLIDER-306 list exit code/exception depends on
output of report is o
SLIDER-306 list exit code/exception depends on output of report is o
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ea5e6909
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ea5e6909
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ea5e6909
Branch: refs/heads/develop
Commit: ea5e69093442a880cf1d5f2f8acd21b4bb02121c
Parents: 47fba9b
Author: Steve Loughran <st...@apache.org>
Authored: Tue Aug 19 13:16:20 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Fri Oct 24 21:51:10 2014 +0100
----------------------------------------------------------------------
.../main/java/org/apache/slider/client/SliderClient.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/ea5e6909/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index bded128..f837ca4 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1728,8 +1728,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
ApplicationReport report =
findClusterInInstanceList(instances, clustername);
if (report != null) {
- logAppReport(report, true, true);
- instanceFound = true;
+ instanceFound = logAppReport(report, true, false);
}
}
// exit code if the instance was found
@@ -1746,8 +1745,11 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
* @param report report to log
* @param live only list live apps
* @param history list historical containers
+ * @return whether the report was logged or not
*/
- public void logAppReport(ApplicationReport report, boolean live, boolean history) {
+ public boolean logAppReport(ApplicationReport report,
+ boolean live,
+ boolean history) {
// app is active if it is accepted or running
boolean active = isApplicationActive(report);
@@ -1755,6 +1757,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
if (toLog) {
log.info(SliderUtils.appReportToString(report, "\n"));
}
+ return toLog;
}
/**