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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
slapos.toolbox
Commits
c2f048cc
Commit
c2f048cc
authored
Aug 11, 2014
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
runner: adds timeout for command runned in minishell
parent
58877976
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
8 deletions
+15
-8
slapos/runner/static/js/scripts/shell.js
slapos/runner/static/js/scripts/shell.js
+14
-8
slapos/runner/views.py
slapos/runner/views.py
+1
-0
No files found.
slapos/runner/static/js/scripts/shell.js
View file @
c2f048cc
...
...
@@ -38,7 +38,13 @@ $(document).ready(function () {
var
data
=
{
command
:
command
};
var
old_shell_btn_background
=
$
(
"
.shell_btn
"
).
css
(
"
background
"
);
$
(
"
.shell_btn
"
).
css
(
"
background
"
,
"
url(/static/css/images/loading-min.gif) center right no-repeat
"
)
$
.
post
(
"
/runCommand
"
,
data
,
function
(
data
)
{
$
.
ajax
({
type
:
"
POST
"
,
url
:
$SCRIPT_ROOT
+
"
/runCommand
"
,
data
:
data
,
timeout
:
600000
})
.
done
(
function
(
data
)
{
var
data
=
"
<p><span class=
\"
runned-command
\"
>
"
+
data
.
path
+
"
>>>
"
+
command
+
"
</span></p><br/><pre>
"
+
data
.
data
+
"
</pre><br/>
"
;
$
(
"
#shell-result
"
).
append
(
data
);
$
(
"
#shell-input
"
).
val
(
""
);
...
...
slapos/runner/views.py
View file @
c2f048cc
...
...
@@ -730,6 +730,7 @@ def runCommand():
return
jsonify
(
path
=
cwd
,
data
=
"Changed directory, now in : "
+
cwd
)
try
:
setMiniShellHistory
(
app
.
config
,
command
)
command
=
"timeout 600 "
+
command
return
jsonify
(
path
=
cwd
,
data
=
subprocess
.
check_output
(
command
,
stderr
=
subprocess
.
STDOUT
,
shell
=
True
,
cwd
=
cwd
))
except
subprocess
.
CalledProcessError
as
e
:
error
=
"Error : process exited with exit code "
+
str
(
e
.
returncode
)
+
\
...
...
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