Repository: incubator-slider Updated Branches: refs/heads/feature/auto_generate_storm_pkg 02faa944d -> 4c808204d
SLIDER-399. Agent command doesn't consider the case where LOG_DIRS contains multiple directories Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/4c808204 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4c808204 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4c808204 Branch: refs/heads/feature/auto_generate_storm_pkg Commit: 4c808204d749f1504b768b12a98bf64f583e49d3 Parents: 02faa94 Author: Sumit Mohanty <smoha...@hortonworks.com> Authored: Thu Sep 4 21:50:52 2014 -0700 Committer: Sumit Mohanty <smoha...@hortonworks.com> Committed: Thu Sep 4 21:50:52 2014 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/slider/providers/agent/AgentKeys.java | 1 + .../org/apache/slider/providers/agent/AgentProviderService.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4c808204/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java index 1622367..1da99b0 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentKeys.java @@ -91,6 +91,7 @@ public interface AgentKeys { String CREATE_DEF_ZK_NODE = "create.default.zookeeper.node"; String HEARTBEAT_MONITOR_INTERVAL = "heartbeat.monitor.interval"; String AGENT_INSTANCE_DEBUG_DATA = "agent.instance.debug.data"; + String AGENT_OUT_FILE = "agent.out"; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4c808204/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java index d188d49..02ef625 100644 --- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java +++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java @@ -333,8 +333,7 @@ public class AgentProviderService extends AbstractProviderService implements operation.add(debugCmd); } - String outfile = new File(logDir, "agent.out").toString(); - operation.add("> " + outfile + " 2>&1"); + operation.add("> " + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/" + AgentKeys.AGENT_OUT_FILE + " 2>&1"); launcher.addCommand(operation.build());
