Merge pull request #2773 from InfinityPacer/dev

fix(queue): handle queue.Empty instead of TimeoutError on timeout
This commit is contained in:
jxxghp
2024-09-25 08:10:23 +08:00
committed by GitHub
+2 -1
View File
@@ -1,4 +1,5 @@
import platform import platform
import queue
import re import re
import threading import threading
import traceback import traceback
@@ -242,7 +243,7 @@ class Monitor(metaclass=Singleton):
self.__handle_file(storage=item.get("storage"), self.__handle_file(storage=item.get("storage"),
event_path=item.get("filepath"), event_path=item.get("filepath"),
mon_path=item.get("mon_path")) mon_path=item.get("mon_path"))
except TimeoutError: except queue.Empty:
continue continue
except Exception as e: except Exception as e:
logger.error(f"整理队列处理出现错误:{e}") logger.error(f"整理队列处理出现错误:{e}")