Commit ecfb3cae authored by Vitaly Lipatov's avatar Vitaly Lipatov

autoban: preserve active ban on reset

parent a67641e6
...@@ -110,9 +110,7 @@ def cmd_reset(ip): ...@@ -110,9 +110,7 @@ def cmd_reset(ip):
return return
r.delete(meta_key) r.delete(meta_key)
r.zrem(SCHEDULE_KEY, ip) print(f"Reset offense counter for {ip}; active ban state is unchanged")
r.srem(PERMANENT_KEY, ip)
print(f"Reset offense counter for {ip}")
def cmd_pending(): def cmd_pending():
......
...@@ -221,15 +221,13 @@ class AutoBanManager: ...@@ -221,15 +221,13 @@ class AutoBanManager:
def reset_offense_counter(self, ip): def reset_offense_counter(self, ip):
""" """
Сбросить счётчик нарушений для IP. Сбросить историю нарушений, не меняя текущий ban.
Args: Args:
ip: IP-адрес ip: IP-адрес
""" """
try: try:
self.r.delete(f"{self.META_PREFIX}{ip}") self.r.delete(f"{self.META_PREFIX}{ip}")
self.r.zrem(self.SCHEDULE_KEY, ip)
self.r.srem(self.PERMANENT_KEY, ip)
except Exception as e: except Exception as e:
log.error(f"AutoBanManager.reset_offense_counter error: {e}") log.error(f"AutoBanManager.reset_offense_counter error: {e}")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment