Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gyuricska Milán
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
61a38f2e
authored
Jul 24, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: allow waiting for Operation result
parent
531ce4e6
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletions
+17
-1
circle/dashboard/views.py
+17
-1
No files found.
circle/dashboard/views.py
View file @
61a38f2e
...
@@ -52,6 +52,7 @@ from django_tables2 import SingleTableView
...
@@ -52,6 +52,7 @@ from django_tables2 import SingleTableView
from
braces.views
import
(
LoginRequiredMixin
,
SuperuserRequiredMixin
,
from
braces.views
import
(
LoginRequiredMixin
,
SuperuserRequiredMixin
,
PermissionRequiredMixin
)
PermissionRequiredMixin
)
from
braces.views._access
import
AccessMixin
from
braces.views._access
import
AccessMixin
from
celery.exceptions
import
TimeoutError
from
django_sshkey.models
import
UserKey
from
django_sshkey.models
import
UserKey
...
@@ -583,12 +584,27 @@ class OperationView(RedirectToLoginMixin, DetailView):
...
@@ -583,12 +584,27 @@ class OperationView(RedirectToLoginMixin, DetailView):
extra
=
{}
extra
=
{}
result
=
None
result
=
None
try
:
try
:
self
.
get_op
()
.
async
(
user
=
request
.
user
,
**
extra
)
task
=
self
.
get_op
()
.
async
(
user
=
request
.
user
,
**
extra
)
except
Exception
as
e
:
except
Exception
as
e
:
messages
.
error
(
request
,
_
(
'Could not start operation.'
))
messages
.
error
(
request
,
_
(
'Could not start operation.'
))
logger
.
exception
(
e
)
logger
.
exception
(
e
)
result
=
e
result
=
e
else
:
else
:
wait
=
self
.
wait_for_result
if
wait
:
try
:
result
=
task
.
get
(
timeout
=
wait
,
interval
=
min
((
wait
/
5
,
.
5
)))
except
TimeoutError
:
logger
.
debug
(
"Result didn't arrive in
%
ss"
,
self
.
wait_for_result
,
exc_info
=
True
)
except
Exception
as
e
:
messages
.
error
(
request
,
_
(
'Operation failed.'
))
logger
.
debug
(
"Operation failed."
,
exc_info
=
True
)
result
=
e
else
:
messages
.
success
(
request
,
_
(
'Operation succeeded.'
))
if
result
is
None
:
messages
.
success
(
request
,
_
(
'Operation is started.'
))
messages
.
success
(
request
,
_
(
'Operation is started.'
))
if
"/json"
in
request
.
META
.
get
(
"HTTP_ACCEPT"
,
""
):
if
"/json"
in
request
.
META
.
get
(
"HTTP_ACCEPT"
,
""
):
...
...
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