Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 6 additions & 11 deletions geonode/proxy/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,9 @@
#
#########################################################################
from django.apps import AppConfig
from django.db.models.signals import post_migrate
from django.db.models import signals

from .utils import proxy_urls_registry


def run_setup_hooks(*args, **kwargs):
proxy_urls_registry.initialize()
from .utils import link_post_delete, link_post_save


class GeoNodeProxyAppConfig(AppConfig):
Expand All @@ -32,8 +28,7 @@ class GeoNodeProxyAppConfig(AppConfig):

def ready(self):
super().ready()
try:
run_setup_hooks()
except Exception:
# This is in case the Service table doesn't exist yet
post_migrate.connect(run_setup_hooks, sender=self)
from geonode.base.models import Link

signals.post_save.connect(link_post_save, sender=Link)
signals.post_delete.connect(link_post_delete, sender=Link)
7 changes: 0 additions & 7 deletions geonode/proxy/utils.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
from urllib.parse import urlsplit

from django.conf import settings
from django.db.models import signals
from django.utils.timezone import now

site_url = urlsplit(settings.SITEURL)
Expand All @@ -10,7 +9,6 @@


class ProxyUrlsRegistry:
_first_init = True
_last_registry_load = None
_registry_reload_threshold = getattr(settings, "PROXY_RELOAD_REGISTRY_THRESHOLD_DAYS", 1)

Expand All @@ -27,11 +25,6 @@ def initialize(self):
remote_host = urlsplit(link.url).hostname
self.register_host(remote_host)

if self._first_init:
signals.post_save.connect(link_post_save, sender=Link)
signals.post_delete.connect(link_post_delete, sender=Link)
self._first_init = False

self._last_registry_load = now()

def set(self, hosts):
Expand Down