Resolve conflict

elastic · Sep 14, 2023 · fd0ee5d · fd0ee5d
1 parent f5afdfb
commit fd0ee5d
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/internal/pkg/agent/application/upgrade/crash_checker.go b/internal/pkg/agent/application/upgrade/crash_checker.go
@@ -75,13 +75,9 @@ func (ch *CrashChecker) Run(ctx context.Context) {
 				ch.log.Error(err)
 			}
 
-<<<<<<< HEAD
-=======
-			ch.log.Infof("retrieved service PID [%d]", pid)
->>>>>>> 66fa5a7a92 (Improve Upgrade-related logging (#3382))
 			ch.q.Push(pid)
 			restarts := ch.q.Distinct()
-			ch.log.Debugf("retrieved service PID [%d] changed %d times within %d", pid, restarts, evaluatedPeriods)
+			ch.log.Infof("retrieved service PID [%d] changed %d times within %d", pid, restarts, evaluatedPeriods)
 			if restarts > crashesAllowed {
 				ch.notifyChan <- errors.New(fmt.Sprintf("service restarted '%d' times within '%v' seconds", restarts, ch.checkInterval.Seconds()))
 			}