Skip to content

Commit 6886795

Browse files
Matthew Fishercarmstrong
authored andcommitted
fix(controller): give access to /domains
The controller needs access to /domains, not /router.
1 parent 6e8b0c1 commit 6886795

2 files changed

Lines changed: 13 additions & 6 deletions

File tree

controller/api/models.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -542,11 +542,6 @@ class Domain(AuditedModel):
542542
def __str__(self):
543543
return self.domain
544544

545-
def create(self):
546-
_publish_domains(app=str(self.app), domains=list(self.app.domain_set.all()))
547-
msg = 'Domains deployed: ' + ' '.join(str(i) for i in self.app.domain_set.all())
548-
log_event(self.app, msg)
549-
550545

551546
@python_2_unicode_compatible
552547
class Key(UuidAuditedModel):
@@ -584,6 +579,16 @@ def _log_config_updated(**kwargs):
584579
log_event(config.app, "Config {} updated".format(config))
585580

586581

582+
def _log_domain_added(**kwargs):
583+
domain = kwargs['instance']
584+
log_event(domain.app, "Domain {} added".format(domain))
585+
586+
587+
def _log_domain_removed(**kwargs):
588+
domain = kwargs['instance']
589+
log_event(domain.app, "Domain {} removed".format(domain))
590+
591+
587592
def _etcd_publish_key(**kwargs):
588593
key = kwargs['instance']
589594
_etcd_client.write('/deis/builder/users/{}/{}'.format(
@@ -615,6 +620,8 @@ def _etcd_publish_domains(**kwargs):
615620
post_save.connect(_log_build_created, sender=Build, dispatch_uid='api.models')
616621
post_save.connect(_log_release_created, sender=Release, dispatch_uid='api.models')
617622
post_save.connect(_log_config_updated, sender=Config, dispatch_uid='api.models')
623+
post_save.connect(_log_domain_added, sender=Domain, dispatch_uid='api.models')
624+
post_delete.connect(_log_domain_removed, sender=Domain, dispatch_uid='api.models')
618625

619626

620627
# save FSM transitions as they happen

controller/conf.d/confd_settings.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ keys = [
99
"/deis/cache",
1010
"/deis/database",
1111
"/deis/registry",
12-
"/deis/router",
12+
"/deis/domains",
1313
]
1414
check_cmd = "test -e {{ .src }}"
1515
reload_cmd = "/app/bin/reload"

0 commit comments

Comments
 (0)