From 21a5d41e8c8ce2cfc0b5d577410797a524d64df5 Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Tue, 19 Apr 2022 14:51:56 +0100 Subject: [PATCH] proxies: handle origin destruction --- app/mirror_sites.py | 2 +- app/models.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/mirror_sites.py b/app/mirror_sites.py index e530c78..309ffe3 100644 --- a/app/mirror_sites.py +++ b/app/mirror_sites.py @@ -25,7 +25,7 @@ def mirror_sites(): "url": a.url } for a in x.proxies if a.url is not None and not a.deprecated and not a.destroyed and a.provider == "cloudfront" - ]} for x in Origin.query.order_by(Origin.domain_name).all() + ]} for x in Origin.query.order_by(Origin.domain_name).all() if x.destroyed is None ] } diff --git a/app/models.py b/app/models.py index a32dcc5..5ed6eaf 100644 --- a/app/models.py +++ b/app/models.py @@ -89,6 +89,11 @@ class Origin(AbstractConfiguration): "updated": self.updated } + def destroy(self): + super().destroy() + for proxy in self.proxies: + proxy.destroy() + def __repr__(self): return '' % self.domain_name