@ -59,11 +59,13 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
handler := func ( idx int , bean interface { } , limit int ) error {
handler := func ( idx int , bean interface { } , limit int ) error {
var item SyncRequest
var item SyncRequest
var repo * repo_model . Repository
if m , ok := bean . ( * repo_model . Mirror ) ; ok {
if m , ok := bean . ( * repo_model . Mirror ) ; ok {
if m . Repo == nil {
if m . Repo == nil {
log . Error ( "Disconnected mirror found: %d" , m . ID )
log . Error ( "Disconnected mirror found: %d" , m . ID )
return nil
return nil
}
}
repo = m . Repo
item = SyncRequest {
item = SyncRequest {
Type : PullMirrorType ,
Type : PullMirrorType ,
RepoID : m . RepoID ,
RepoID : m . RepoID ,
@ -73,6 +75,7 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
log . Error ( "Disconnected push-mirror found: %d" , m . ID )
log . Error ( "Disconnected push-mirror found: %d" , m . ID )
return nil
return nil
}
}
repo = m . Repo
item = SyncRequest {
item = SyncRequest {
Type : PushMirrorType ,
Type : PushMirrorType ,
RepoID : m . RepoID ,
RepoID : m . RepoID ,
@ -89,17 +92,16 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
default :
default :
}
}
// Check if this request is already in the queue
// Push to the Queue
has , err := mirrorQueue . Has ( & item )
if err := mirrorQueue . Push ( & item ) ; err != nil {
if err != nil {
if err == queue . ErrAlreadyInQueue {
return err
if item . Type == PushMirrorType {
log . Trace ( "PushMirrors for %-v already queued for sync" , repo )
} else {
log . Trace ( "PullMirrors for %-v already queued for sync" , repo )
}
}
if has {
return nil
return nil
}
}
// Push to the Queue
if err := mirrorQueue . Push ( & item ) ; err != nil {
return err
return err
}
}
@ -110,23 +112,29 @@ func Update(ctx context.Context, pullLimit, pushLimit int) error {
return nil
return nil
}
}
pullMirrorsRequested := 0
if pullLimit != 0 {
if pullLimit != 0 {
requested = 0
if err := repo_model . MirrorsIterate ( func ( idx int , bean interface { } ) error {
if err := repo_model . MirrorsIterate ( func ( idx int , bean interface { } ) error {
return handler ( idx , bean , pullLimit )
return handler ( idx , bean , pullLimit )
} ) ; err != nil && err != errLimit {
} ) ; err != nil && err != errLimit {
log . Error ( "MirrorsIterate: %v" , err )
log . Error ( "MirrorsIterate: %v" , err )
return err
return err
}
}
pullMirrorsRequested , requested = requested , 0
}
}
pushMirrorsRequested := 0
if pushLimit != 0 {
if pushLimit != 0 {
requested = 0
if err := repo_model . PushMirrorsIterate ( func ( idx int , bean interface { } ) error {
if err := repo_model . PushMirrorsIterate ( func ( idx int , bean interface { } ) error {
return handler ( idx , bean , pushLimit )
return handler ( idx , bean , pushLimit )
} ) ; err != nil && err != errLimit {
} ) ; err != nil && err != errLimit {
log . Error ( "PushMirrorsIterate: %v" , err )
log . Error ( "PushMirrorsIterate: %v" , err )
return err
return err
}
}
pushMirrorsRequested , requested = requested , 0
}
}
log . Trace ( "Finished: Update" )
log . Trace ( "Finished: Update: %d pull mirrors and %d push mirrors queued " , pullMirrorsRequested , pushMirrorsRequested )
return nil
return nil
}
}