Skip to content

Fix some linter warnings, part 10 #266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matrixik merged 7 commits into from
Oct 20, 2017
Merged

Fix some linter warnings, part 10 #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1c0ac36
Fix some linter warnings, part 10
digitalfishpond Oct 19, 2017
0cd9b0d
Merge branch 'master' into fix-lint-10
kornicameister Oct 20, 2017
0e06e8f
Merge branch 'master' into fix-lint-10
digitalfishpond Oct 20, 2017
2d273ed
Merge branch 'master' into fix-lint-10
digitalfishpond Oct 20, 2017
f056531
Merge branch 'master' into fix-lint-10
digitalfishpond Oct 20, 2017
26bace2
Merge branch 'master' into fix-lint-10
kornicameister Oct 20, 2017
ee7fdc6
bump logspout version
digitalfishpond Oct 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion logspout/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repository: monasca/logspout
variants:
- tag: 0.0.1
- tag: 0.0.2
aliases:
- :latest
args:
Expand Down
4 changes: 2 additions & 2 deletions logspout/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
MONASCA_LOG_AGENT_WAIT_RETRIES=${MONASCA_LOG_AGENT_WAIT_RETRIES:-"24"}
MONASCA_LOG_AGENT_WAIT_DELAY=${MONASCA_LOG_AGENT_WAIT_DELAY:-"5"}

if [ $MONASCA_WAIT_FOR_LOG_AGENT = "true" ]; then
if [ "$MONASCA_WAIT_FOR_LOG_AGENT" = "true" ]; then
RETRIES=$MONASCA_LOG_AGENT_WAIT_RETRIES \
SLEEP_LENGTH=$MONASCA_LOG_AGENT_WAIT_DELAY \
/wait-for.sh ${MONASCA_LOG_AGENT_URI} && /bin/logspout
/wait-for.sh "${MONASCA_LOG_AGENT_URI}" && /bin/logspout
else
/bin/logspout
fi
3 changes: 3 additions & 0 deletions monasca-agent-base/apk_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
#!/bin/sh
# (C) Copyright 2017 FUJITSU LIMITED

install_apk_deps() {
apk add --no-cache libxml2 py2-psutil
apk add --no-cache --virtual build-dep git make g++ linux-headers libxml2-dev libxslt-dev
Expand Down