Repository: ambari Updated Branches: refs/heads/trunk c26e2ff61 -> 2ff332504
AMBARI-16167. LogFeeder component logs not picked up correctly (oleewere) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ff33250 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ff33250 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ff33250 Branch: refs/heads/trunk Commit: 2ff332504c6f7ac5b0a3e64231521258f096f664 Parents: c26e2ff Author: Oliver Szabo <[email protected]> Authored: Thu Apr 28 19:08:22 2016 +0200 Committer: oleewere <[email protected]> Committed: Thu Apr 28 19:40:07 2016 +0200 ---------------------------------------------------------------------- .../LOGSEARCH/0.5.0/package/scripts/logsearch_common.py | 2 +- .../LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff33250/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch_common.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch_common.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch_common.py index 42f69d0..d0ac389 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch_common.py +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch_common.py @@ -39,7 +39,7 @@ def kill_process(pid_file, user, log_dir): hard_kill_cmd = format("{sudo} kill -9 {pid}") Execute(hard_kill_cmd, not_if=format("! ({process_id_exists_command}) || ( sleep {wait_time} && ! ({process_id_exists_command}) )"), - ignore_fialures = True) + ignore_failures = True) try: Execute(format("! ({process_id_exists_command})"), tries=20, http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff33250/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 index 77318ee..27be671 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 @@ -36,7 +36,7 @@ limitations under the License. <appender name="rolling_file_json" class="org.apache.ambari.logsearch.appender.LogsearchRollingFileAppender"> - <param name="file" value="logs/logsearch-logfeeder.json" /> + <param name="file" value="{{logfeeder_log_dir}}/logsearch-logfeeder.json" /> <param name="append" value="true" /> <param name="maxFileSize" value="10MB" /> <param name="maxBackupIndex" value="10" />
