Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
feudal
feudalBackend
Commits
380cc928
Commit
380cc928
authored
Mar 12, 2018
by
Lukas Burgey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move some functionality into a receiver
parent
1575bdc9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
django_backend/backend/clientapi/views.py
django_backend/backend/clientapi/views.py
+1
-6
django_backend/backend/models.py
django_backend/backend/models.py
+8
-3
No files found.
django_backend/backend/clientapi/views.py
View file @
380cc928
import
logging
from
rest_framework
import
generics
,
views
,
status
from
rest_framework
import
generics
,
views
from
rest_framework.authentication
import
TokenAuthentication
from
rest_framework.response
import
Response
from
..models
import
RabbitMQInstance
from
.serializers
import
SiteSerializer
,
ServiceSerializer
LOGGER
=
logging
.
getLogger
(
__name__
)
...
...
@@ -28,10 +27,6 @@ class ConfigurationView(generics.ListAPIView):
def
get_queryset
(
self
):
site
=
self
.
request
.
user
.
site
# we update the rabbitmq permission here, so the
# client can access all of his services, even new ones
RabbitMQInstance
.
load
().
update_site
(
site
)
return
site
.
services
.
all
()
...
...
django_backend/backend/models.py
View file @
380cc928
...
...
@@ -681,7 +681,6 @@ class DeploymentTask(models.Model):
from
.clientapi.serializers
import
DeploymentTaskSerializer
msg
=
json
.
dumps
(
DeploymentTaskSerializer
(
self
).
data
)
# FIXME select the rabbitmq instance more meaningful
RabbitMQInstance
.
load
().
publish_by_service
(
self
.
service
,
msg
,
...
...
@@ -744,12 +743,18 @@ def register_at_rabbitmq(sender, instance=None, created=False, **kwargs):
if
not
created
:
return
RabbitMQInstance
().
register_site
(
instance
)
RabbitMQInstance
.
load
().
register_site
(
instance
)
@
receiver
(
pre_delete
,
sender
=
Site
)
def
deregister_at_rabbitmq
(
sender
,
instance
=
None
,
**
kwargs
):
RabbitMQInstance
().
deregister_site
(
instance
)
RabbitMQInstance
.
load
().
deregister_site
(
instance
)
@
receiver
(
post_save
,
sender
=
Service
)
def
update_at_rabbitmq
(
sender
,
instance
=
None
,
**
kwargs
):
for
site
in
instance
.
site
.
all
():
RabbitMQInstance
.
load
().
update_site
(
site
)
@
receiver
(
post_save
,
sender
=
User
)
...
...
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