fix 开启插件后再启动监控服务

This commit is contained in:
thsrite 2023-08-04 20:38:08 +08:00
parent 0b9bb90a63
commit 286dd9570d

View File

@ -88,43 +88,44 @@ class DirMonitor(_PluginBase):
# 停止现有任务 # 停止现有任务
self.stop_service() self.stop_service()
# 启动任务 if self._enabled:
monitor_dirs = self._monitor_dirs.split("\n") # 启动任务
if not monitor_dirs: monitor_dirs = self._monitor_dirs.split("\n")
return if not monitor_dirs:
for mon_path in monitor_dirs: return
if not mon_path: for mon_path in monitor_dirs:
continue if not mon_path:
# 检查目录是不是媒体库目录的子目录 continue
if Path(mon_path).is_relative_to(settings.LIBRARY_PATH): # 检查目录是不是媒体库目录的子目录
logger.warn(f"{mon_path} 是媒体库目录的子目录,无法监控") if Path(mon_path).is_relative_to(settings.LIBRARY_PATH):
self.systemmessage.put(f"{mon_path} 是媒体库目录的子目录,无法监控") logger.warn(f"{mon_path} 是媒体库目录的子目录,无法监控")
continue self.systemmessage.put(f"{mon_path} 是媒体库目录的子目录,无法监控")
continue
try: try:
if self._mode == "compatibility": if self._mode == "compatibility":
# 兼容模式目录同步性能降低且NAS不能休眠但可以兼容挂载的远程共享目录如SMB # 兼容模式目录同步性能降低且NAS不能休眠但可以兼容挂载的远程共享目录如SMB
observer = PollingObserver(timeout=10) observer = PollingObserver(timeout=10)
else: else:
# 内部处理系统操作类型选择最优解 # 内部处理系统操作类型选择最优解
observer = Observer(timeout=10) observer = Observer(timeout=10)
self._observer.append(observer) self._observer.append(observer)
observer.schedule(FileMonitorHandler(mon_path, self), path=mon_path, recursive=True) observer.schedule(FileMonitorHandler(mon_path, self), path=mon_path, recursive=True)
observer.daemon = True observer.daemon = True
observer.start() observer.start()
logger.info(f"{mon_path} 的目录监控服务启动") logger.info(f"{mon_path} 的目录监控服务启动")
except Exception as e: except Exception as e:
err_msg = str(e) err_msg = str(e)
if "inotify" in err_msg and "reached" in err_msg: if "inotify" in err_msg and "reached" in err_msg:
logger.warn(f"目录监控服务启动出现异常:{err_msg}请在宿主机上不是docker容器内执行以下命令并重启" logger.warn(f"目录监控服务启动出现异常:{err_msg}请在宿主机上不是docker容器内执行以下命令并重启"
+ """ + """
echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf
echo fs.inotify.max_user_instances=524288 | sudo tee -a /etc/sysctl.conf echo fs.inotify.max_user_instances=524288 | sudo tee -a /etc/sysctl.conf
sudo sysctl -p sudo sysctl -p
""") """)
else: else:
logger.error(f"{mon_path} 启动目录监控失败:{err_msg}") logger.error(f"{mon_path} 启动目录监控失败:{err_msg}")
self.systemmessage.put(f"{mon_path} 启动目录监控失败:{err_msg}") self.systemmessage.put(f"{mon_path} 启动目录监控失败:{err_msg}")
def file_change_handler(self, event, text: str, event_path: str): def file_change_handler(self, event, text: str, event_path: str):
""" """