[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 <juc@odoo.com>
This commit is contained in:
@@ -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
|
||||
# ------------------------------------------------------------
|
||||
|
||||
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user