Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-19 07:07:42 +01:00
Code Issues Projects Releases Wiki Activity

Refactor the job stats manager (remove useless object references)

Browse Source
This commit is contained in:
Steven Zou 2018-03-28 12:51:55 +08:00
parent 3ce31586df
commit ee2da73c71
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/jobservice_v2/opm/redis_job_stats_mgr.go
View File

@ -15,10 +15,6 @@ import (
"github.com/vmware/harbor/src/jobservice_v2/errs" "github.com/vmware/harbor/src/jobservice_v2/errs"
"github.com/vmware/harbor/src/jobservice_v2/logger" "github.com/vmware/harbor/src/jobservice_v2/logger"
"github.com/vmware/harbor/src/jobservice_v2/period"
"github.com/gocraft/work"
"github.com/garyburd/redigo/redis" "github.com/garyburd/redigo/redis"
"github.com/vmware/harbor/src/jobservice_v2/job" "github.com/vmware/harbor/src/jobservice_v2/job"
"github.com/vmware/harbor/src/jobservice_v2/models" "github.com/vmware/harbor/src/jobservice_v2/models"
@ -53,12 +49,9 @@ type queueItem struct {
//RedisJobStatsManager implements JobStatsManager based on redis. //RedisJobStatsManager implements JobStatsManager based on redis.
type RedisJobStatsManager struct { type RedisJobStatsManager struct {
namespace string namespace string
redisPool *redis.Pool redisPool *redis.Pool
context context.Context context context.Context
client *work.Client
scheduler period.Interface
stopChan chan struct{} stopChan chan struct{}
doneChan chan struct{} doneChan chan struct{}
processChan chan *queueItem processChan chan *queueItem
@ -67,13 +60,11 @@ type RedisJobStatsManager struct {
} }
//NewRedisJobStatsManager is constructor of RedisJobStatsManager //NewRedisJobStatsManager is constructor of RedisJobStatsManager
func NewRedisJobStatsManager(ctx context.Context, namespace string, redisPool *redis.Pool, client *work.Client, scheduler period.Interface) *RedisJobStatsManager { func NewRedisJobStatsManager(ctx context.Context, namespace string, redisPool *redis.Pool) *RedisJobStatsManager {
return &RedisJobStatsManager{ return &RedisJobStatsManager{
namespace: namespace, namespace: namespace,
context: ctx, context: ctx,
redisPool: redisPool, redisPool: redisPool,
client: client,
scheduler: scheduler,
stopChan: make(chan struct{}, 1), stopChan: make(chan struct{}, 1),
doneChan: make(chan struct{}, 1), doneChan: make(chan struct{}, 1),
processChan: make(chan *queueItem, processBufferSize), processChan: make(chan *queueItem, processBufferSize),

2
src/jobservice_v2/pool/redis_pool.go
View File

@ -61,7 +61,7 @@ func NewGoCraftWorkPool(ctx *env.Context, namespace string, workerCount uint, re
client := work.NewClient(namespace, redisPool) client := work.NewClient(namespace, redisPool)
scheduler := period.NewRedisPeriodicScheduler(ctx, namespace, redisPool) scheduler := period.NewRedisPeriodicScheduler(ctx, namespace, redisPool)
sweeper := period.NewSweeper(namespace, redisPool, client) sweeper := period.NewSweeper(namespace, redisPool, client)
statsMgr := opm.NewRedisJobStatsManager(ctx.SystemContext, namespace, redisPool, client, scheduler) statsMgr := opm.NewRedisJobStatsManager(ctx.SystemContext, namespace, redisPool)
msgServer := NewMessageServer(ctx.SystemContext, namespace, redisPool) msgServer := NewMessageServer(ctx.SystemContext, namespace, redisPool)
return &GoCraftWorkPool{ return &GoCraftWorkPool{
namespace: namespace, namespace: namespace,