Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.toolbox
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos.toolbox
Commits
70109873
Commit
70109873
authored
Jul 28, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner: new state for slapgrid : notupdated
This means building failed, but a previous instance is still running
parent
099d7e2d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
slapos/runner/static/css/styles.css
slapos/runner/static/css/styles.css
+1
-1
slapos/runner/static/js/scripts/process.js
slapos/runner/static/js/scripts/process.js
+8
-8
No files found.
slapos/runner/static/css/styles.css
View file @
70109873
...
@@ -535,7 +535,7 @@ padding: 10px;height: 80px;padding-bottom:15px;}
...
@@ -535,7 +535,7 @@ padding: 10px;height: 80px;padding-bottom:15px;}
display
:
block
;
display
:
block
;
float
:
left
;
float
:
left
;
}
}
.log_info_box
div
.state_running
span
{
.log_info_box
div
.state_running
span
,
.log_info_box
div
.state_notupdated
span
{
background
:
#FFC800
;
background
:
#FFC800
;
}
}
.log_info_box
div
.state_terminated
span
{
.log_info_box
div
.state_terminated
span
{
...
...
slapos/runner/static/js/scripts/process.js
View file @
70109873
...
@@ -130,7 +130,11 @@ function getRunningState() {
...
@@ -130,7 +130,11 @@ function getRunningState() {
updateStatus
(
currentProcess
,
"
running
"
);
updateStatus
(
currentProcess
,
"
running
"
);
}
else
{
}
else
{
build_success
=
(
data
.
software
.
success
===
0
)?
"
terminated
"
:
"
failed
"
;
build_success
=
(
data
.
software
.
success
===
0
)?
"
terminated
"
:
"
failed
"
;
run_success
=
(
data
.
instance
.
success
===
0
)?
"
terminated
"
:
"
failed
"
;
if
(
last_run
<
data
.
software
.
last_build
&&
data
.
software
.
success
===
1
)
{
run_success
=
"
notupdated
"
;
}
else
{
run_success
=
(
data
.
instance
.
success
===
0
)?
"
terminated
"
:
"
failed
"
;
}
updateStatus
(
"
software
"
,
build_success
);
updateStatus
(
"
software
"
,
build_success
);
updateStatus
(
"
instance
"
,
run_success
);
updateStatus
(
"
instance
"
,
run_success
);
}
}
...
@@ -210,17 +214,13 @@ function updateStatus(elt, val) {
...
@@ -210,17 +214,13 @@ function updateStatus(elt, val) {
case
"
running
"
:
case
"
running
"
:
$
(
src
).
children
(
'
p
'
).
text
(
"
Processing
"
);
$
(
src
).
children
(
'
p
'
).
text
(
"
Processing
"
);
break
;
break
;
case
"
notupdated
"
:
$
(
src
).
children
(
'
p
'
).
text
(
"
Not updated
"
);
break
;
case
"
failed
"
:
case
"
failed
"
:
$
(
src
).
children
(
'
p
'
).
text
(
"
Failed
"
);
$
(
src
).
children
(
'
p
'
).
text
(
"
Failed
"
);
break
;
break
;
}
}
// in case of failure
if
(
$
(
"
#salpgridLog
"
).
text
().
indexOf
(
"
Failed to run buildout profile
"
)
!==
-
1
)
{
var
src
=
'
#
'
+
elt
+
'
_run_state
'
,
value
=
'
state_
'
+
"
stopped
"
;
$
(
src
).
removeClass
();
$
(
src
).
addClass
(
value
);
$
(
src
).
children
(
'
p
'
).
text
(
"
Buildout Failed
"
);
}
}
}
function
setRunningState
(
data
)
{
function
setRunningState
(
data
)
{
...
...
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