Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
ff63ae6f
Commit
ff63ae6f
authored
May 26, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Request recipe: Better error reporting
parent
e66a813b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
slapos/recipe/request.py
slapos/recipe/request.py
+5
-5
No files found.
slapos/recipe/request.py
View file @
ff63ae6f
...
@@ -36,6 +36,7 @@ class Recipe(object):
...
@@ -36,6 +36,7 @@ class Recipe(object):
slap
=
slapmodule
.
slap
()
slap
=
slapmodule
.
slap
()
self
.
software_release_url
=
options
[
'software-url'
]
self
.
software_release_url
=
options
[
'software-url'
]
self
.
name
=
options
[
'name'
]
slap
.
initializeConnection
(
options
[
'server-url'
],
slap
.
initializeConnection
(
options
[
'server-url'
],
options
.
get
(
'key-file'
),
options
.
get
(
'key-file'
),
...
@@ -73,7 +74,7 @@ class Recipe(object):
...
@@ -73,7 +74,7 @@ class Recipe(object):
options
[
'config-%s'
%
config_parameter
]
options
[
'config-%s'
%
config_parameter
]
self
.
instance
=
self
.
request
(
options
[
'software-url'
],
software_type
,
self
.
instance
=
self
.
request
(
options
[
'software-url'
],
software_type
,
options
[
'name'
]
,
partition_parameter_kw
=
partition_parameter_kw
,
self
.
name
,
partition_parameter_kw
=
partition_parameter_kw
,
filter_kw
=
filter_kw
,
shared
=
self
.
isSlave
)
filter_kw
=
filter_kw
,
shared
=
self
.
isSlave
)
self
.
failed
=
None
self
.
failed
=
None
...
@@ -93,12 +94,11 @@ class Recipe(object):
...
@@ -93,12 +94,11 @@ class Recipe(object):
status
=
self
.
instance
.
getState
()
status
=
self
.
instance
.
getState
()
except
slapmodule
.
NotFoundError
:
except
slapmodule
.
NotFoundError
:
status
=
"not ready yet, please try again"
status
=
"not ready yet, please try again"
# XXX-Cedric : currently raise an error. So swallow it...
except
AttributeError
:
except
AttributeError
:
status
=
"unknown"
status
=
"unknown"
self
.
logger
.
error
(
"Connection parameter %s not found.
"
raise
KeyError
(
"Connection parameter %s not found when requesting
"
"
Status of requested instance is : %s."
%
(
self
.
failed
,
status
))
"
instance named %s. Status of instance is: %s."
%
(
self
.
failed
,
raise
KeyError
(
"Connection parameter %s not found. "
%
self
.
failed
)
self
.
name
,
status
)
)
return
[]
return
[]
update
=
install
update
=
install
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