Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
Carlos Ramos Carreño
erp5
Commits
53f43215
Commit
53f43215
authored
Sep 24, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add exception thrown by slapproxy as well.
parent
3a48a924
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
slapos/recipe/request.py
slapos/recipe/request.py
+2
-2
No files found.
slapos/recipe/request.py
View file @
53f43215
...
@@ -134,7 +134,7 @@ class Recipe(object):
...
@@ -134,7 +134,7 @@ class Recipe(object):
try
:
try
:
options
[
'connection-%s'
%
param
]
=
str
(
options
[
'connection-%s'
%
param
]
=
str
(
instance
.
getConnectionParameter
(
param
))
instance
.
getConnectionParameter
(
param
))
except
slapmodule
.
NotFoundError
:
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
)
:
options
[
'connection-%s'
%
param
]
=
''
options
[
'connection-%s'
%
param
]
=
''
if
self
.
failed
is
None
:
if
self
.
failed
is
None
:
self
.
failed
=
param
self
.
failed
=
param
...
@@ -144,7 +144,7 @@ class Recipe(object):
...
@@ -144,7 +144,7 @@ class Recipe(object):
# Check instance status to know if instance has been deployed
# Check instance status to know if instance has been deployed
try
:
try
:
status
=
self
.
instance
.
getState
()
status
=
self
.
instance
.
getState
()
except
slapmodule
.
NotFoundError
:
except
(
slapmodule
.
NotFoundError
,
slapmodule
.
ServerError
)
:
status
=
'not ready yet, please try again'
status
=
'not ready yet, please try again'
except
AttributeError
:
except
AttributeError
:
status
=
'unknown'
status
=
'unknown'
...
...
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