Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
107
Merge Requests
107
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
4269eb18
Commit
4269eb18
authored
Dec 04, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Format exception before printing it
parent
2cd488ab
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
slapos/recipe/request.py
slapos/recipe/request.py
+5
-3
No files found.
slapos/recipe/request.py
View file @
4269eb18
...
...
@@ -25,9 +25,9 @@
#
##############################################################################
import
logging
from
slapos
import
slap
as
slapmodule
import
slapos.recipe.librecipe.generic
as
librecipe
import
traceback
DEFAULT_SOFTWARE_TYPE
=
'RootSoftwareInstance'
...
...
@@ -125,6 +125,7 @@ class Recipe(object):
librecipe
.
GenericBaseRecipe
.
TRUE_VALUES
self
.
_raise_request_exception
=
None
self
.
_raise_request_exception_formatted
=
None
self
.
instance
=
None
try
:
self
.
instance
=
request
(
software_url
,
software_type
,
...
...
@@ -134,6 +135,7 @@ class Recipe(object):
options
[
'instance_guid'
]
=
self
.
instance
.
getId
()
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
,
slapmodule
.
ResourceNotReady
)
as
exc
:
self
.
_raise_request_exception
=
exc
self
.
_raise_request_exception_formatted
=
traceback
.
format_exc
()
for
param
in
return_parameters
:
options
[
'connection-%s'
%
param
]
=
''
...
...
@@ -176,9 +178,9 @@ class RequestOptional(Recipe):
Same as slapos.cookbook:request, but won't raise in case of problem.
"""
def
install
(
self
):
if
self
.
_raise_request_exception
:
if
self
.
_raise_request_exception
_formatted
:
self
.
logger
.
warning
(
'Optional request failed:'
)
self
.
logger
.
warning
(
self
.
_raise_request_exception
)
self
.
logger
.
warning
(
self
.
_raise_request_exception
_formatted
)
elif
self
.
failed
is
not
None
:
# Check instance status to know if instance has been deployed
try
:
...
...
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