Repository: ambari Updated Branches: refs/heads/trunk 78efd0483 -> 789b6544d
Revert "AMBARI-9034. Add ability to change log and pid dirs for AMS daemons. Log dir fix. (swagle)" This reverts commit 78efd0483f56026059f858b0eedaa8ba5db24e50. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fc7394bf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fc7394bf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fc7394bf Branch: refs/heads/trunk Commit: fc7394bf99fa963e5a1e3a205d4db1fe7e80374b Parents: 78efd04 Author: Siddharth Wagle <swa...@hortonworks.com> Authored: Wed Jan 7 18:42:26 2015 -0800 Committer: Siddharth Wagle <swa...@hortonworks.com> Committed: Wed Jan 7 18:42:26 2015 -0800 ---------------------------------------------------------------------- .../conf/unix/ambari-metrics-collector | 2 +- .../common-services/AMS/0.1.0/configuration/ams-env.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/fc7394bf/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector ---------------------------------------------------------------------- diff --git a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector index 714fa94..aabbde8 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector +++ b/ambari-metrics/ambari-metrics-timelineservice/conf/unix/ambari-metrics-collector @@ -31,7 +31,7 @@ HBASE_CONF_DIR=/etc/ams-hbase/conf METRIC_COLLECTOR=ambari-metrics-collector -AMS_LOG_DIR=/var/log/ambari-metrics-collector +AMS_LOG_DIR=/var/log/ambari-metric-collector STOP_TIMEOUT=5 http://git-wip-us.apache.org/repos/asf/ambari/blob/fc7394bf/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml index 18c4b61..c2f3d49 100644 --- a/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml +++ b/ambari-server/src/main/resources/common-services/AMS/0.1.0/configuration/ams-env.xml @@ -27,22 +27,22 @@ </property> <property> <name>ams_collector_log_dir</name> - <value>/var/log/ambari-metrics-collector</value> + <value>/var/log/ambari-metric-collector</value> <description>Collector log directory.</description> </property> <property> <name>ams_collector_pid_dir</name> - <value>/var/run/ambari-metrics-collector</value> + <value>/var/run/ambari-metric-collector</value> <description>Collector pid directory.</description> </property> <property> <name>ams_monitor_pid_dir</name> - <value>/var/run/ambari-metrics-monitor</value> + <value>/var/run/ambari-metric-monitor</value> <description>Monitor pid directory.</description> </property> <property> <name>ams_monitor_log_dir</name> - <value>/var/log/ambari-metrics-monitor</value> + <value>/var/log/ambari-metric-monitor</value> <description>Monitor log directory.</description> </property>
