add logging
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
5089535fce
commit
e1aff8d16b
GPG key ID:
4406BBBF8845D632
7 changed files with 73 additions and 33 deletions
|
|
@ -5,7 +5,7 @@ import (
|
|||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"log/slog"
|
||||
"path/filepath"
|
||||
|
||||
aptclone "github.com/syonad/clonepack/internal/clone/apt"
|
||||
|
|
@ -59,7 +59,7 @@ func (s *CloneService) runClone(repoID, jobID int64, repo *store.Repo) {
|
|||
ctx := context.Background()
|
||||
|
||||
if err := s.jobStore.MarkCloneJobStarted(ctx, jobID); err != nil {
|
||||
log.Printf("clone job %d: failed to mark started: %v", jobID, err)
|
||||
slog.Error("clone job: failed to mark started", "job_id", jobID, "error", err)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
@ -70,12 +70,12 @@ func (s *CloneService) runClone(repoID, jobID int64, repo *store.Repo) {
|
|||
case "rpm":
|
||||
cloner := rpm.New(repo.SourceURL, destDir)
|
||||
cloner.OnProgress = func(p rpm.Progress) {
|
||||
log.Printf("clone job %d: %s (%d bytes)", jobID, p.File, p.BytesDone)
|
||||
slog.Debug("clone progress", "job_id", jobID, "file", p.File, "bytes", p.BytesDone)
|
||||
}
|
||||
if err := cloner.Clone(ctx); err != nil {
|
||||
cloneErr = err
|
||||
} else if err := rpm.RegenerateMetadata(destDir); err != nil {
|
||||
log.Printf("clone job %d: metadata regeneration failed: %v", jobID, err)
|
||||
slog.Warn("clone job: metadata regeneration failed", "job_id", jobID, "error", err)
|
||||
}
|
||||
|
||||
case "apt":
|
||||
|
|
@ -86,7 +86,7 @@ func (s *CloneService) runClone(repoID, jobID int64, repo *store.Repo) {
|
|||
}
|
||||
cloner := aptclone.New(repo.SourceURL, destDir, cfg)
|
||||
cloner.OnProgress = func(file string, bytes int64) {
|
||||
log.Printf("clone job %d: %s (%d bytes)", jobID, file, bytes)
|
||||
slog.Debug("clone progress", "job_id", jobID, "file", file, "bytes", bytes)
|
||||
}
|
||||
cloneErr = cloner.Clone(ctx)
|
||||
}
|
||||
|
|
@ -94,10 +94,10 @@ func (s *CloneService) runClone(repoID, jobID int64, repo *store.Repo) {
|
|||
if cloneErr != nil {
|
||||
errMsg := cloneErr.Error()
|
||||
_ = s.jobStore.MarkCloneJobFinished(ctx, jobID, store.CloneJobFailed, &errMsg)
|
||||
log.Printf("clone job %d: failed: %v", jobID, cloneErr)
|
||||
slog.Error("clone job failed", "job_id", jobID, "error", cloneErr)
|
||||
return
|
||||
}
|
||||
|
||||
_ = s.jobStore.MarkCloneJobFinished(ctx, jobID, store.CloneJobCompleted, nil)
|
||||
log.Printf("clone job %d: completed", jobID)
|
||||
slog.Info("clone job completed", "job_id", jobID)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import (
|
|||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"log"
|
||||
"log/slog"
|
||||
"path/filepath"
|
||||
|
||||
aptclone "github.com/syonad/clonepack/internal/clone/apt"
|
||||
|
|
@ -92,16 +92,16 @@ func (s *RepoService) initStorage(repo *store.Repo) {
|
|||
switch repo.Type {
|
||||
case "rpm":
|
||||
if err := rpmclone.InitEmptyRepo(localDir); err != nil {
|
||||
log.Printf("init storage for repo %d: %v", repo.ID, err)
|
||||
slog.Warn("init storage failed", "repo_id", repo.ID, "error", err)
|
||||
}
|
||||
case "apt":
|
||||
var cfg aptclone.Config
|
||||
if err := json.Unmarshal([]byte(repo.Config), &cfg); err != nil {
|
||||
log.Printf("init storage for repo %d: parse config: %v", repo.ID, err)
|
||||
slog.Warn("init storage: parse config failed", "repo_id", repo.ID, "error", err)
|
||||
return
|
||||
}
|
||||
if err := aptclone.InitEmptyRepo(localDir, cfg); err != nil {
|
||||
log.Printf("init storage for repo %d: %v", repo.ID, err)
|
||||
slog.Warn("init storage failed", "repo_id", repo.ID, "error", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import (
|
|||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"log"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
|
@ -104,7 +104,7 @@ func (s *SyncService) ScanRepo(ctx context.Context, repoID int64) error {
|
|||
}
|
||||
|
||||
if len(candidates) == 0 {
|
||||
log.Printf("sync: repo %d is up to date", repoID)
|
||||
slog.Debug("sync: repo up to date", "repo_id", repoID)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -129,10 +129,10 @@ func (s *SyncService) ScanRepo(ctx context.Context, repoID int64) error {
|
|||
candidates = filtered
|
||||
|
||||
if len(candidates) == 0 {
|
||||
log.Printf("sync: repo %d is up to date (all new packages are blocked)", repoID)
|
||||
slog.Debug("sync: all new packages are blocked", "repo_id", repoID)
|
||||
return nil
|
||||
}
|
||||
log.Printf("sync: repo %d has %d new package(s)", repoID, len(candidates))
|
||||
slog.Info("sync: new packages found", "repo_id", repoID, "count", len(candidates))
|
||||
|
||||
switch repo.SyncMode {
|
||||
case "auto":
|
||||
|
|
@ -199,13 +199,16 @@ func (s *SyncService) ApprovePending(ctx context.Context, repoID int64, ids []in
|
|||
downloadErrors = append(downloadErrors, fmt.Errorf("mkdirall %s: %w", pkg.Location, err))
|
||||
continue
|
||||
}
|
||||
slog.Info("downloading package", "repo_id", repoID, "package", pkg.Name, "version", pkg.Version)
|
||||
if _, err := rpmclone.DownloadAndVerify(ctx, s.httpClient, url, dest, pkg.ChecksumType, pkg.Checksum); err != nil {
|
||||
slog.Warn("download failed", "repo_id", repoID, "package", pkg.Name, "error", err)
|
||||
downloadErrors = append(downloadErrors, fmt.Errorf("download %s: %w", pkg.Name, err))
|
||||
continue
|
||||
}
|
||||
slog.Info("package downloaded", "repo_id", repoID, "package", pkg.Name, "version", pkg.Version)
|
||||
// Supprime immédiatement de la liste — même si la suite échoue, le paquet est acquis.
|
||||
if err := s.pendingStore.DeletePending(ctx, []int64{pkg.ID}); err != nil {
|
||||
log.Printf("delete pending %d: %v", pkg.ID, err)
|
||||
slog.Warn("delete pending failed", "pending_id", pkg.ID, "error", err)
|
||||
}
|
||||
anyApproved = true
|
||||
}
|
||||
|
|
@ -214,18 +217,18 @@ func (s *SyncService) ApprovePending(ctx context.Context, repoID int64, ids []in
|
|||
switch repo.Type {
|
||||
case "rpm":
|
||||
if err := rpmclone.RegenerateMetadata(localDir); err != nil {
|
||||
log.Printf("metadata regeneration for repo %d failed: %v", repoID, err)
|
||||
slog.Warn("metadata regeneration failed", "repo_id", repoID, "error", err)
|
||||
}
|
||||
label := "auto-" + time.Now().UTC().Format(time.RFC3339)
|
||||
if _, err := s.snapshotSvc.TakeSnapshot(context.Background(), repoID, label); err != nil {
|
||||
log.Printf("auto-snapshot for repo %d failed: %v", repoID, err)
|
||||
slog.Warn("auto-snapshot failed", "repo_id", repoID, "error", err)
|
||||
}
|
||||
case "apt":
|
||||
var cfg aptclone.Config
|
||||
if err := json.Unmarshal([]byte(repo.Config), &cfg); err != nil {
|
||||
log.Printf("parse apt config for repo %d: %v", repoID, err)
|
||||
slog.Warn("parse apt config failed", "repo_id", repoID, "error", err)
|
||||
} else if err := aptclone.RegenerateMetadata(localDir, cfg); err != nil {
|
||||
log.Printf("metadata regeneration for repo %d failed: %v", repoID, err)
|
||||
slog.Warn("metadata regeneration failed", "repo_id", repoID, "error", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -285,13 +288,13 @@ func (s *SyncService) RejectPending(ctx context.Context, repoID int64, ids []int
|
|||
|
||||
func (s *SyncService) StartScheduler(ctx context.Context, interval time.Duration) {
|
||||
go func() {
|
||||
log.Printf("sync scheduler started (interval=%s)", interval)
|
||||
slog.Info("sync scheduler started", "interval", interval)
|
||||
ticker := time.NewTicker(interval)
|
||||
defer ticker.Stop()
|
||||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
log.Printf("sync scheduler stopped")
|
||||
slog.Info("sync scheduler stopped")
|
||||
return
|
||||
case <-ticker.C:
|
||||
s.runScheduledScan(ctx)
|
||||
|
|
@ -303,12 +306,12 @@ func (s *SyncService) StartScheduler(ctx context.Context, interval time.Duration
|
|||
func (s *SyncService) runScheduledScan(ctx context.Context) {
|
||||
repos, err := s.repoStore.ListRepos(ctx)
|
||||
if err != nil {
|
||||
log.Printf("sync scheduler: list repos error: %v", err)
|
||||
slog.Error("sync scheduler: list repos failed", "error", err)
|
||||
return
|
||||
}
|
||||
for _, repo := range repos {
|
||||
if err := s.ScanRepo(ctx, repo.ID); err != nil {
|
||||
log.Printf("sync scheduler: scan repo %d error: %v", repo.ID, err)
|
||||
slog.Warn("sync scheduler: scan failed", "repo_id", repo.ID, "error", err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue