Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
A prog2-höz tartozó friss repo anyagok itt elérhetőek:
https://git.iit.bme.hu/
Commit
95d3b15c
authored
Sep 05, 2014
by
Őry Máté
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: allow saving Profile if store timeouts
parent
5c732fe0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
circle/dashboard/models.py
+2
-2
circle/dashboard/store_api.py
+1
-0
No files found.
circle/dashboard/models.py
View file @
95d3b15c
...
@@ -48,7 +48,7 @@ from common.models import HumanReadableObject, create_readable, Encoder
...
@@ -48,7 +48,7 @@ from common.models import HumanReadableObject, create_readable, Encoder
from
vm.tasks.agent_tasks
import
add_keys
,
del_keys
from
vm.tasks.agent_tasks
import
add_keys
,
del_keys
from
vm.models.instance
import
ACCESS_METHODS
from
vm.models.instance
import
ACCESS_METHODS
from
.store_api
import
Store
,
NoStoreException
,
NotOkException
from
.store_api
import
Store
,
NoStoreException
,
NotOkException
,
Timeout
from
.validators
import
connect_command_template_validator
from
.validators
import
connect_command_template_validator
logger
=
getLogger
(
__name__
)
logger
=
getLogger
(
__name__
)
...
@@ -346,7 +346,7 @@ def update_store_profile(sender, **kwargs):
...
@@ -346,7 +346,7 @@ def update_store_profile(sender, **kwargs):
profile
.
disk_quota
)
profile
.
disk_quota
)
except
NoStoreException
:
except
NoStoreException
:
logger
.
debug
(
"Store is not available."
)
logger
.
debug
(
"Store is not available."
)
except
NotOkException
:
except
(
NotOkException
,
Timeout
)
:
logger
.
critical
(
"Store is not accepting connections."
)
logger
.
critical
(
"Store is not accepting connections."
)
...
...
circle/dashboard/store_api.py
View file @
95d3b15c
...
@@ -7,6 +7,7 @@ from datetime import datetime
...
@@ -7,6 +7,7 @@ from datetime import datetime
from
django.http
import
Http404
from
django.http
import
Http404
from
django.conf
import
settings
from
django.conf
import
settings
from
requests
import
get
,
post
,
codes
from
requests
import
get
,
post
,
codes
from
requests.exceptions
import
Timeout
# noqa
from
sizefield.utils
import
filesizeformat
from
sizefield.utils
import
filesizeformat
logger
=
logging
.
getLogger
(
__name__
)
logger
=
logging
.
getLogger
(
__name__
)
...
...
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