wk233/sysmonitord
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[monitor] 规范watcher代码

This commit is contained in:
wuko233 2026-04-03 08:42:05 +08:00
parent c9a5a40645
commit 99eb6c2aed
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/start/start.go
View File

@ -87,7 +87,7 @@ var StartCmd = &cobra.Command{
// ====== 启动文件监听 ====== // ====== 启动文件监听 ======
logger.Log.Info("正在启动文件监听...") logger.Log.Info("正在启动文件监听...")
mon, err := watcher.NewWatcher(cfg.Scanner.File.IncludePaths, cfg.Scanner.File.ExcludePaths) mon, err := watcher.NewWatcher(cfg)
if err != nil { if err != nil {
logger.Log.Error("启动文件监听失败", zap.Error(err)) logger.Log.Error("启动文件监听失败", zap.Error(err))
os.Exit(1) os.Exit(1)

17
internal/monitor/watcher/watcher.go
View File

@ -5,6 +5,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"sysmonitord/internal/config"
"sysmonitord/pkg/logger" "sysmonitord/pkg/logger"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
@ -13,8 +14,7 @@ import (
type Watcher struct { type Watcher struct {
fsnWatcher *fsnotify.Watcher fsnWatcher *fsnotify.Watcher
paths []string cfg *config.Config
ignore []string
eventChan chan EventMsg eventChan chan EventMsg
} }
@ -24,7 +24,7 @@ type EventMsg struct {
FileInfo os.FileInfo FileInfo os.FileInfo
} }
func NewWatcher(paths []string, ignore []string) (*Watcher, error) { func NewWatcher(cfg *config.Config) (*Watcher, error) {
fsnW, err := fsnotify.NewWatcher() fsnW, err := fsnotify.NewWatcher()
if err != nil { if err != nil {
return nil, fmt.Errorf("[monitor] 创建文件监听失败: %w", err) return nil, fmt.Errorf("[monitor] 创建文件监听失败: %w", err)
@ -32,14 +32,15 @@ func NewWatcher(paths []string, ignore []string) (*Watcher, error) {
return &Watcher{ return &Watcher{
fsnWatcher: fsnW, fsnWatcher: fsnW,
paths: paths, cfg: cfg,
ignore: ignore,
eventChan: make(chan EventMsg, 100), eventChan: make(chan EventMsg, 100),
}, nil }, nil
} }
func (w *Watcher) Start() { func (w *Watcher) Start() {
for _, path := range w.paths { paths := w.cfg.Scanner.File.IncludePaths
for _, path := range paths {
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
fmt.Printf("[monitor] 路径不存在: %s\n", path) fmt.Printf("[monitor] 路径不存在: %s\n", path)
continue continue
@ -48,7 +49,7 @@ func (w *Watcher) Start() {
w.addPath(path) w.addPath(path)
} }
logger.Log.Info("[monitor] 已启用文件监听", zap.Strings("paths", w.paths)) logger.Log.Info("[monitor] 已启用文件监听", zap.Strings("paths", paths))
go w.eventLoop() go w.eventLoop()
} }
@ -113,7 +114,7 @@ func (w *Watcher) addPath(path string) {
} }
if d.IsDir() { if d.IsDir() {
for _, ignorePath := range w.ignore { for _, ignorePath := range w.cfg.Scanner.File.ExcludePaths {
if strings.HasPrefix(subPath, ignorePath) { if strings.HasPrefix(subPath, ignorePath) {
return filepath.SkipDir return filepath.SkipDir
} }