push: code changes

backend/modules/nfregex/firegex.py

@@ -79,7 +79,7 @@ class FiregexInterceptor:
         self.update_task: asyncio.Task
         self.ack_arrived = False
         self.ack_status = None
-        self.ack_fail_what = "Unknown"
+        self.ack_fail_what = "Queue response timed-out"
         self.ack_lock = asyncio.Lock()
     
     @classmethod
@@ -158,7 +158,7 @@ class FiregexInterceptor:
                 async with asyncio.timeout(3):
                     await self.ack_lock.acquire()
             except TimeoutError:
-                pass
+                self.ack_fail_what = "Queue response timed-out"
             if not self.ack_arrived or not self.ack_status:
                 await self.stop()
                 raise HTTPException(status_code=500, detail=f"NFQ error: {self.ack_fail_what}")

backend/modules/nfregex/firewall.py

@@ -45,11 +45,9 @@ class ServiceManager:
 
     async def next(self,to):
         async with self.lock:
-            if (self.status, to) == (STATUS.ACTIVE, STATUS.STOP):
+            if to == STATUS.STOP:
                 await self.stop()
-                self._set_status(to)
-            # PAUSE -> ACTIVE
-            elif (self.status, to) == (STATUS.STOP, STATUS.ACTIVE):
+            if to == STATUS.ACTIVE:
                 await self.restart()
 
     def _stats_updater(self,filter:RegexFilter):
@@ -71,6 +69,7 @@ class ServiceManager:
         if self.interceptor:
             await self.interceptor.stop()
             self.interceptor = None
+        self._set_status(STATUS.STOP)
     
     async def restart(self):
         await self.stop()