Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
slapos
Commits
d6d873c4
Commit
d6d873c4
authored
8 years ago
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
monitor: bootstrap promise don't fail if pid file doesn't exists
parent
89b6630e
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
12 deletions
+14
-12
stack/monitor/buildout.cfg
stack/monitor/buildout.cfg
+1
-1
stack/monitor/instance-monitor.cfg.jinja2.in
stack/monitor/instance-monitor.cfg.jinja2.in
+13
-11
No files found.
stack/monitor/buildout.cfg
View file @
d6d873c4
...
@@ -93,7 +93,7 @@ recipe = slapos.recipe.template:jinja2
...
@@ -93,7 +93,7 @@ recipe = slapos.recipe.template:jinja2
filename = template-monitor.cfg
filename = template-monitor.cfg
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
template = ${:_profile_base_location_}/instance-monitor.cfg.jinja2.in
rendered = ${buildout:directory}/template-monitor.cfg
rendered = ${buildout:directory}/template-monitor.cfg
md5sum =
c25e1c8206fb7c08924ae3d5c16521f
c
md5sum =
61734742e3a01a8a1d512f491b2190c
c
context =
context =
key apache_location apache:location
key apache_location apache:location
key gzip_location gzip:location
key gzip_location gzip:location
...
...
This diff is collapsed.
Click to expand it.
stack/monitor/instance-monitor.cfg.jinja2.in
View file @
d6d873c4
...
@@ -372,6 +372,7 @@ check-secure = 1
...
@@ -372,6 +372,7 @@ check-secure = 1
recipe = collective.recipe.template
recipe = collective.recipe.template
file = ${monitor-conf-parameters:promise-output-file}
file = ${monitor-conf-parameters:promise-output-file}
input = inline:#!{{ dash_executable_location }}
input = inline:#!{{ dash_executable_location }}
if [ -f "${monitor-conf-parameters:pid-file}" ]; then
PID=`cat ${monitor-conf-parameters:pid-file}`
PID=`cat ${monitor-conf-parameters:pid-file}`
for i in {1..20}; do
for i in {1..20}; do
# wait for monitor bootstrap script to finish (max 10 seconds)
# wait for monitor bootstrap script to finish (max 10 seconds)
...
@@ -383,6 +384,7 @@ input = inline:#!{{ dash_executable_location }}
...
@@ -383,6 +384,7 @@ input = inline:#!{{ dash_executable_location }}
sleep 0.5
sleep 0.5
fi
fi
done
done
fi
if [ ! -f "${:file}" ]; then echo "Monitor bootstrap exited with error." && exit 2; else echo "Bootstrap OK"; fi
if [ ! -f "${:file}" ]; then echo "Monitor bootstrap exited with error." && exit 2; else echo "Bootstrap OK"; fi
output = ${directory:promises}/monitor-bootstrap-status
output = ${directory:promises}/monitor-bootstrap-status
mode = 700
mode = 700
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment