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
Kirill Smelkov
slapos.toolbox
Commits
399dc9f6
Commit
399dc9f6
authored
Dec 09, 2013
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slaprunner: runSoftwareProfile and runInstanceProfile now use runSlapgridUntilSuccess
parent
d1c7106d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
9 deletions
+6
-9
slapos/runner/views.py
slapos/runner/views.py
+6
-9
No files found.
slapos/runner/views.py
View file @
399dc9f6
...
@@ -3,10 +3,11 @@
...
@@ -3,10 +3,11 @@
# pylint: disable-msg=W0311,C0301,C0103,C0111
# pylint: disable-msg=W0311,C0301,C0103,C0111
import
json
import
os
import
os
import
shutil
import
shutil
import
thread
import
urllib
import
urllib
import
json
from
flask
import
(
Flask
,
request
,
redirect
,
url_for
,
render_template
,
from
flask
import
(
Flask
,
request
,
redirect
,
url_for
,
render_template
,
g
,
flash
,
jsonify
,
session
,
abort
,
send_file
)
g
,
flash
,
jsonify
,
session
,
abort
,
send_file
)
...
@@ -136,10 +137,8 @@ def removeSoftware():
...
@@ -136,10 +137,8 @@ def removeSoftware():
def
runSoftwareProfile
():
def
runSoftwareProfile
():
if
runSoftwareWithLock
(
app
.
config
):
thread
.
start_new_thread
(
runSlapgridUntilSuccess
,
(
app
.
config
,
"software"
))
return
jsonify
(
result
=
True
)
return
jsonify
(
result
=
True
)
else
:
return
jsonify
(
result
=
False
)
# instance views
# instance views
...
@@ -200,10 +199,8 @@ def removeInstance():
...
@@ -200,10 +199,8 @@ def removeInstance():
def
runInstanceProfile
():
def
runInstanceProfile
():
if
not
os
.
path
.
exists
(
app
.
config
[
'instance_root'
]):
if
not
os
.
path
.
exists
(
app
.
config
[
'instance_root'
]):
os
.
mkdir
(
app
.
config
[
'instance_root'
])
os
.
mkdir
(
app
.
config
[
'instance_root'
])
if
runInstanceWithLock
(
app
.
config
):
thread
.
start_new_thread
(
runSlapgridUntilSuccess
,
(
app
.
config
,
"instance"
))
return
jsonify
(
result
=
True
)
return
jsonify
(
result
=
True
)
else
:
return
jsonify
(
result
=
False
)
def
viewLog
():
def
viewLog
():
...
...
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