Fix failure count check

Author: akclace

internal/server/app_updates.go

@@ -177,7 +177,7 @@ func (s *Server) ReloadApps(ctx context.Context, appPathGlob string, approve, dr
 }
 
 func (s *Server) loadAppCode(ctx context.Context, tx types.Transaction, appEntry *types.AppEntry, branch, commit, gitAuth string, repoCache *RepoCache, forceReload bool) (bool, error) {
-	s.Info().Msgf("Reloading app code %v", appEntry)
+	s.Debug().Msgf("Reloading app code %v", appEntry)
 
 	if isGit(appEntry.SourceUrl) {
 		currentSha := appEntry.Metadata.VersionMetadata.GitCommit
@@ -194,7 +194,7 @@ func (s *Server) loadAppCode(ctx context.Context, tx types.Transaction, appEntry
 		}
 		if !forceReload && currentSha != "" && newSha == currentSha && (commit == "" || commit == currentSha) {
 			// If no commit is specified, and the current version is the same as the latest commit, skip reload
-			s.Info().Msgf("App %s already at latest commit %s, skipping reload", appEntry.AppPathDomain(), newSha)
+			s.Debug().Msgf("App %s already at latest commit %s, skipping reload", appEntry.AppPathDomain(), newSha)
 			return false, nil
 		}
 

internal/server/sync.go

@@ -6,6 +6,7 @@ package server
 import (
 	"context"
 	"encoding/base64"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -57,6 +58,10 @@ func (s *Server) CreateSyncEntry(ctx context.Context, path string, scheduled, dr
 	if err != nil {
 		return nil, err
 	}
+	if syncStatus.Error != "" {
+		// The sync job job failed, delete the entry
+		return nil, errors.New(syncStatus.Error)
+	}
 
 	ret := types.SyncCreateResponse{
 		Id:                syncEntry.Id,
@@ -225,7 +230,7 @@ func (s *Server) runSyncJob(ctx context.Context, inputTx types.Transaction, entr
 		status.Error = applyErr.Error()
 		applyInfo = &types.AppApplyResponse{}
 		applyInfo.FilteredApps = lastRunApps
-		status.FailureCount++
+		status.FailureCount = entry.Status.FailureCount + 1
 	} else {
 		status.CommitId = applyInfo.CommitId
 		status.FailureCount = 0