Fix queue pop error and stat empty repository error (#10248)
* Fix queue pop error and stat empty repository error * Fix errorrelease/v1.15
parent
83a8944fcf
commit
3d69bbd58f
|
@ -19,6 +19,10 @@ func (db *DBIndexer) Index(id int64) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if repo.IsEmpty {
|
||||
return nil
|
||||
}
|
||||
|
||||
status, err := repo.GetIndexerStatus(models.RepoIndexerTypeStats)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
|
@ -121,7 +121,7 @@ func (fifo *RedisByteFIFO) PushFunc(data []byte, fn func() error) error {
|
|||
// Pop pops data from the start of the fifo
|
||||
func (fifo *RedisByteFIFO) Pop() ([]byte, error) {
|
||||
data, err := fifo.client.LPop(fifo.queueName).Bytes()
|
||||
if err != nil && err == redis.Nil {
|
||||
if err == nil || err == redis.Nil {
|
||||
return data, nil
|
||||
}
|
||||
return data, err
|
||||
|
|
|
@ -4,6 +4,8 @@
|
|||
|
||||
package queue
|
||||
|
||||
import "github.com/go-redis/redis"
|
||||
|
||||
// RedisUniqueQueueType is the type for redis queue
|
||||
const RedisUniqueQueueType Type = "unique-redis"
|
||||
|
||||
|
@ -102,7 +104,7 @@ func (fifo *RedisUniqueByteFIFO) PushFunc(data []byte, fn func() error) error {
|
|||
// Pop pops data from the start of the fifo
|
||||
func (fifo *RedisUniqueByteFIFO) Pop() ([]byte, error) {
|
||||
data, err := fifo.client.LPop(fifo.queueName).Bytes()
|
||||
if err != nil {
|
||||
if err != nil && err != redis.Nil {
|
||||
return data, err
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue