Skip to content

Commit d34b839

Browse files
author
Gabriel Monroy
committed
fix(controller): properly purge domain etcd keys on app deleteion
1 parent fd6bd50 commit d34b839

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

controller/api/models.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -790,8 +790,11 @@ def _etcd_publish_domains(**kwargs):
790790
if app_domains:
791791
_etcd_client.write('/deis/domains/{}'.format(app),
792792
' '.join(str(d.domain) for d in app_domains))
793-
else:
794-
_etcd_client.delete('/deis/domains/{}'.format(app))
793+
794+
795+
def _etcd_purge_domains(**kwargs):
796+
app = kwargs['instance'].app
797+
_etcd_client.delete('/deis/domains/{}'.format(app))
795798

796799

797800
# Log significant app-related events
@@ -825,6 +828,6 @@ def _save_transition(**kwargs):
825828
post_delete.connect(_etcd_purge_key, sender=Key, dispatch_uid='api.models')
826829
post_delete.connect(_etcd_purge_user, sender=User, dispatch_uid='api.models')
827830
post_save.connect(_etcd_publish_domains, sender=Domain, dispatch_uid='api.models')
828-
post_delete.connect(_etcd_publish_domains, sender=Domain, dispatch_uid='api.models')
831+
post_delete.connect(_etcd_purge_domains, sender=Domain, dispatch_uid='api.models')
829832
post_save.connect(_etcd_create_app, sender=App, dispatch_uid='api.models')
830833
post_delete.connect(_etcd_purge_app, sender=App, dispatch_uid='api.models')

0 commit comments

Comments
 (0)