rename q fifo in queue_disk and handle not found err in unique_queue_disk

Author: zeripath

modules/queue/queue_disk.go

@@ -67,32 +67,32 @@ func NewLevelQueueByteFIFO(dataDir string) (*LevelQueueByteFIFO, error) {
 }
 
 // PushFunc will push data into the fifo
-func (q *LevelQueueByteFIFO) PushFunc(data []byte, fn func() error) error {
+func (fifo *LevelQueueByteFIFO) PushFunc(data []byte, fn func() error) error {
 	if fn != nil {
 		if err := fn(); err != nil {
 			return err
 		}
 	}
-	return q.internal.LPush(data)
+	return fifo.internal.LPush(data)
 }
 
 // Pop pops data from the start of the fifo
-func (q *LevelQueueByteFIFO) Pop() ([]byte, error) {
-	data, err := q.internal.RPop()
+func (fifo *LevelQueueByteFIFO) Pop() ([]byte, error) {
+	data, err := fifo.internal.RPop()
 	if err != nil && err != levelqueue.ErrNotFound {
 		return nil, err
 	}
 	return data, nil
 }
 
 // Close this fifo
-func (q *LevelQueueByteFIFO) Close() error {
-	return q.internal.Close()
+func (fifo *LevelQueueByteFIFO) Close() error {
+	return fifo.internal.Close()
 }
 
 // Len returns the length of the fifo
-func (q *LevelQueueByteFIFO) Len() int64 {
-	return q.internal.Len()
+func (fifo *LevelQueueByteFIFO) Len() int64 {
+	return fifo.internal.Len()
 }
 
 func init() {

modules/queue/unique_queue_disk.go

@@ -73,7 +73,11 @@ func (fifo *LevelUniqueQueueByteFIFO) PushFunc(data []byte, fn func() error) err
 
 // Pop pops data from the start of the fifo
 func (fifo *LevelUniqueQueueByteFIFO) Pop() ([]byte, error) {
-	return fifo.internal.RPop()
+	data, err := fifo.internal.RPop()
+	if err != nil && err != levelqueue.ErrNotFound {
+		return nil, err
+	}
+	return data, nil
 }
 
 // Len returns the length of the fifo