Skip to content

Commit d750c94

Browse files
authored
Merge pull request #262 from SeanHai/auth
fix clean monitor
2 parents 15076a4 + e150a3b commit d750c94

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

internal/task/task/monitor/clean_service.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,13 @@ func getCleanFiles(clean map[string]bool, cfg *configure.MonitorConfig) []string
5757
func NewCleanMonitorTask(curveadm *cli.CurveAdm, cfg *configure.MonitorConfig) (*task.Task, error) {
5858
serviceId := curveadm.GetServiceId(cfg.GetId())
5959
containerId, err := curveadm.GetContainerId(serviceId)
60-
if IsSkip(cfg, []string{ROLE_MONITOR_CONF}) {
61-
return nil, nil
62-
} else if err != nil {
60+
if err != nil {
6361
return nil, err
6462
}
63+
if cfg.GetRole() == ROLE_MONITOR_CONF &&
64+
(len(containerId) == 0 || containerId == comm.CLEANED_CONTAINER_ID) {
65+
return nil, nil
66+
}
6567
hc, err := curveadm.GetHost(cfg.GetHost())
6668
if err != nil {
6769
return nil, err

0 commit comments

Comments
 (0)