Skip to content

Modern Docker Management, Designed for Everyone

fix: git sync interval incorrect (#1446)

Kyle Mendella62b31716a01
diff --git a/backend/internal/job/gitops_sync_job.go b/backend/internal/job/gitops_sync_job.go
index fde75a9a8..b750b69b5 100644
--- a/backend/internal/job/gitops_sync_job.go
+++ b/backend/internal/job/gitops_sync_job.go
@@ -32,8 +32,8 @@ func (j *GitOpsSyncJob) Register(ctx context.Context) error {
return nil
}
- // Default interval: 5 minutes
- interval := 5 * time.Minute
+ // Default interval: 1 minute to check for due syncs
+ interval := 1 * time.Minute
slog.InfoContext(ctx, "registering GitOps sync job", "interval", interval.String())
diff --git a/backend/internal/services/gitops_sync_service.go b/backend/internal/services/gitops_sync_service.go
index 4b848b047..9c6cb516b 100644
--- a/backend/internal/services/gitops_sync_service.go
+++ b/backend/internal/services/gitops_sync_service.go
@@ -133,9 +133,11 @@ func (s *GitOpsSyncService) CreateSync(ctx context.Context, environmentID string
Username: &systemUser.Username,
})
- if _, err := s.PerformSync(ctx, sync.EnvironmentID, sync.ID); err != nil {
- slog.ErrorContext(ctx, "Failed to perform initial sync after creation", "syncId", sync.ID, "error", err)
- // Don't fail the entire creation - the sync config exists and can be retried
+ if sync.Enabled {
+ if _, err := s.PerformSync(ctx, sync.EnvironmentID, sync.ID); err != nil {
+ slog.ErrorContext(ctx, "Failed to perform initial sync after creation", "syncId", sync.ID, "error", err)
+ // Don't fail the entire creation - the sync config exists and can be retried
+ }
}
return s.GetSyncByID(ctx, "", sync.ID)
@@ -370,7 +372,8 @@ func (s *GitOpsSyncService) SyncAllEnabled(ctx context.Context) error {
// Check if sync is due
if sync.LastSyncAt != nil {
nextSync := sync.LastSyncAt.Add(time.Duration(sync.SyncInterval) * time.Minute)
- if time.Now().Before(nextSync) {
+ // Use a 30-second buffer to account for execution time drift
+ if time.Now().Add(30 * time.Second).Before(nextSync) {
continue
}
}