Repository: aurora-packaging Updated Branches: refs/heads/master 102b98ce9 -> d77b6b2e2
Fix observer themos extra arguments usage Arguments variable is specified in /etc/default/thermos file but is not used in any init script. Reviewed at https://reviews.apache.org/r/61402/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/d77b6b2e Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/d77b6b2e Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/d77b6b2e Branch: refs/heads/master Commit: d77b6b2e2b8fd996ae698169a91390c71cead377 Parents: 102b98c Author: Mikhail Lesyk <godl...@lesyk.org> Authored: Thu Aug 3 15:42:39 2017 +0200 Committer: Stephan Erb <s...@apache.org> Committed: Thu Aug 3 15:42:39 2017 +0200 ---------------------------------------------------------------------- specs/debian/aurora-executor.thermos.init | 3 ++- specs/debian/aurora-executor.thermos.service | 3 ++- specs/debian/aurora-executor.thermos.upstart | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/d77b6b2e/specs/debian/aurora-executor.thermos.init ---------------------------------------------------------------------- diff --git a/specs/debian/aurora-executor.thermos.init b/specs/debian/aurora-executor.thermos.init index 8ce3911..d4af1cc 100755 --- a/specs/debian/aurora-executor.thermos.init +++ b/specs/debian/aurora-executor.thermos.init @@ -40,7 +40,8 @@ ARGS="--port=${OBSERVER_PORT:-1338} --app_daemonize --app_pidfile=$PIDFILE --log_to_disk=NONE - --log_to_stderr=google:INFO" + --log_to_stderr=google:INFO + ${EXTRA_THERMOS_OBSERVER_ARGS}" case "$1" in start) http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/d77b6b2e/specs/debian/aurora-executor.thermos.service ---------------------------------------------------------------------- diff --git a/specs/debian/aurora-executor.thermos.service b/specs/debian/aurora-executor.thermos.service index 32fc004..70b0463 100644 --- a/specs/debian/aurora-executor.thermos.service +++ b/specs/debian/aurora-executor.thermos.service @@ -21,7 +21,8 @@ ExecStart=/usr/sbin/thermos_observer \ --port=${OBSERVER_PORT} \ --mesos-root=${MESOS_ROOT} \ --log_to_disk=NONE \ - --log_to_stderr=google:INFO + --log_to_stderr=google:INFO \ + ${EXTRA_THERMOS_OBSERVER_ARGS} User=root Group=root Restart=always http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/d77b6b2e/specs/debian/aurora-executor.thermos.upstart ---------------------------------------------------------------------- diff --git a/specs/debian/aurora-executor.thermos.upstart b/specs/debian/aurora-executor.thermos.upstart index 78b11b7..8fc1179 100644 --- a/specs/debian/aurora-executor.thermos.upstart +++ b/specs/debian/aurora-executor.thermos.upstart @@ -24,5 +24,6 @@ script --port=${OBSERVER_PORT:-1338} \ --mesos-root=${MESOS_ROOT:-/var/lib/mesos} \ --log_to_disk=NONE \ - --log_to_stderr=google:INFO + --log_to_stderr=google:INFO \ + ${EXTRA_THERMOS_OBSERVER_ARGS} end script