From 270672daa8fa7705f67475fc6dadd92d7a2f1bc7 Mon Sep 17 00:00:00 2001 From: Julien Castiaux Date: Thu, 19 May 2022 21:02:47 +0000 Subject: [PATCH] [FIX] http_routing: leftover old geoip resolver The geoip resolver was moved from http_routing to code/http.py in #86015 and is always available since then. The `_geoip_resolver` global variable is a leftover we forgot to remove. closes odoo/odoo#91337 Related: odoo/documentation#2151 Related: odoo/enterprise#27399 Signed-off-by: Julien Castiaux --- addons/http_routing/models/ir_http.py | 4 ---- .../models/crm_reveal_rule.py | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/addons/http_routing/models/ir_http.py b/addons/http_routing/models/ir_http.py index 8a8513392d8..759c2af20af 100644 --- a/addons/http_routing/models/ir_http.py +++ b/addons/http_routing/models/ir_http.py @@ -29,10 +29,6 @@ from odoo.tools import config, ustr, pycompat _logger = logging.getLogger(__name__) -# global resolver (GeoIP API is thread-safe, for multithreaded workers) -# This avoids blowing up open files limit -odoo._geoip_resolver = None - # ------------------------------------------------------------ # Slug API # ------------------------------------------------------------ diff --git a/addons/website_crm_iap_reveal/models/crm_reveal_rule.py b/addons/website_crm_iap_reveal/models/crm_reveal_rule.py index b09a87831b8..33b3d0604ca 100644 --- a/addons/website_crm_iap_reveal/models/crm_reveal_rule.py +++ b/addons/website_crm_iap_reveal/models/crm_reveal_rule.py @@ -83,21 +83,9 @@ class CRMRevealRule(models.Model): except Exception: raise ValidationError(_('Enter Valid Regex.')) - @api.model - def _assert_geoip(self): - if not odoo._geoip_resolver: - message = _('Lead Generation requires a GeoIP resolver which could not be found on your system. Please consult https://pypi.org/project/GeoIP/.') - self.env['bus.bus']._sendone(self.env.user.partner_id, 'mail.simple_notification', { - 'title': _('Missing Library'), - 'message': message, - 'sticky': True, - 'warning': True, - }) - @api.model_create_multi def create(self, vals_list): self.clear_caches() # Clear the cache in order to recompute _get_active_rules - self._assert_geoip() return super().create(vals_list) def write(self, vals): @@ -106,7 +94,6 @@ class CRMRevealRule(models.Model): } if set(vals.keys()) & fields_set: self.clear_caches() # Clear the cache in order to recompute _get_active_rules - self._assert_geoip() return super(CRMRevealRule, self).write(vals) def unlink(self):