Refactoring code pt.1

This commit is contained in:
nik012003
2022-08-11 16:11:32 +02:00
committed by DomySh
parent 1931536516
commit f4fe3d3ab5
9 changed files with 354 additions and 73 deletions

View File

@@ -1,6 +1,6 @@
import asyncio
from typing import Dict
from modules.nfregex.firegex import FiregexInterceptor, RegexFilter, delete_by_srv
from modules.nfregex.firegex import FiregexInterceptor, RegexFilter
from modules.nfregex.nftables import FiregexTables, FiregexFilter
from modules.nfregex.models import Regex, Service
from utils.sqlite import SQLite
@@ -95,13 +95,13 @@ class ServiceManager:
async def start(self):
if not self.interceptor:
delete_by_srv(self.srv)
self.interceptor = await FiregexInterceptor.start(FiregexFilter(self.srv.proto,self.srv.port, self.srv.ip_int))
FiregexTables().delete(self.srv)
self.interceptor = await FiregexInterceptor.start(FiregexFilter(self.srv))
await self._update_filters_from_db()
self._set_status(STATUS.ACTIVE)
async def stop(self):
delete_by_srv(self.srv)
FiregexTables().delete(self.srv)
if self.interceptor:
await self.interceptor.stop()
self.interceptor = None