Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
c6577468
Commit
c6577468
authored
Aug 22, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: correctly writes slapgrid result after build&run
parent
20f84c4a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
software/slaprunner/common.cfg
software/slaprunner/common.cfg
+2
-2
software/slaprunner/template/listener_slapgrid.py.in
software/slaprunner/template/listener_slapgrid.py.in
+1
-1
software/slaprunner/template/supervisord.conf.in
software/slaprunner/template/supervisord.conf.in
+1
-1
No files found.
software/slaprunner/common.cfg
View file @
c6577468
...
...
@@ -146,7 +146,7 @@ mode = 0644
[template-supervisord]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
md5sum =
15500060605c0224d3534af60b07c6be
md5sum =
538dfcb373cef33f0041f6dca160802f
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = supervisord.conf.in
download-only = true
...
...
@@ -155,7 +155,7 @@ mode = 0644
[template-listener-slapgrid]
recipe = hexagonit.recipe.download
url = ${:_profile_base_location_}/template/${:filename}
md5sum =
d07b5a9c63dc21209692ee2966107a25
md5sum =
46495fb218fc771547c5ef861cc30933
location = ${buildout:parts-directory}/${:_buildout_section_name_}
filename = listener_slapgrid.py.in
download-only = true
...
...
software/slaprunner/template/listener_slapgrid.py.in
View file @
c6577468
...
...
@@ -26,7 +26,7 @@ def write_slapgrid_result():
info = server.supervisor.getProcessInfo(process)
result = dict()
result['last_build'] = datetime.datetime.fromtimestamp(info['stop']).strftime("%Y-%m-%d %H:%M:%S")
result['success'] =
info['exitstatus']
result['success'] =
(1 if info['statename'] == "FATAL" else info['exitstatus'])
open(file, 'w').write(json.dumps(result))
...
...
software/slaprunner/template/supervisord.conf.in
View file @
c6577468
...
...
@@ -44,6 +44,6 @@ environment = PATH="{{- supervisord['path'] -}}"
[eventlistener:listener-slapgrid]
command = {{ listener_slapgrid }}
events = PROCESS_STATE_EXITED
events = PROCESS_STATE_EXITED
,PROCESS_STATE_FATAL,PROCESS_STATE_BACKOFF
stdout_logfile = {{ supervisord['no_logfile'] }}
stderr_logfile = {{ supervisord['stderr_logfile'] }}
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