alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Code grooming

Browse Source 
Upper case letter when starting the sentence
This commit is contained in:
Carlos C
2016-10-05 00:48:36 +02:00
parent b15ff5ce3a
commit 642cda40bc
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/mqs/bolt.go
View File

@@ -205,7 +205,7 @@ func (mq *BoltDbMQ) delayTask(job *models.Task) (*models.Task, error) {
func (mq *BoltDbMQ) Push(ctx context.Context, job *models.Task) (*models.Task, error) { func (mq *BoltDbMQ) Push(ctx context.Context, job *models.Task) (*models.Task, error) {
ctx, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID}) ctx, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID})
log.Println("push") log.Println("Pushed to MQ")
if job.Delay > 0 { if job.Delay > 0 {
return mq.delayTask(job) return mq.delayTask(job)
@@ -315,7 +315,7 @@ func (mq *BoltDbMQ) Reserve(ctx context.Context) (*models.Task, error) {
} }
_, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID}) _, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID})
log.Println("reserved") log.Println("Reserved")
return &job, nil return &job, nil
} }
@@ -325,8 +325,8 @@ func (mq *BoltDbMQ) Reserve(ctx context.Context) (*models.Task, error) {
func (mq *BoltDbMQ) Delete(ctx context.Context, job *models.Task) error { func (mq *BoltDbMQ) Delete(ctx context.Context, job *models.Task) error {
_, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID}) _, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID})
log.Println("delete") defer log.Println("Deleted")
defer log.Println("deleted")
return mq.db.Update(func(tx *bolt.Tx) error { return mq.db.Update(func(tx *bolt.Tx) error {
b := tx.Bucket(timeoutName(int(*job.Priority))) b := tx.Bucket(timeoutName(int(*job.Priority)))
k := jobKey(job.ID) k := jobKey(job.ID)

6
api/mqs/memory.go
View File

@@ -113,6 +113,7 @@ func (ji *TaskItem) Less(than btree.Item) bool {
func (mq *MemoryMQ) Push(ctx context.Context, job *models.Task) (*models.Task, error) { func (mq *MemoryMQ) Push(ctx context.Context, job *models.Task) (*models.Task, error) {
_, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID}) _, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID})
log.Println("Pushed to MQ")
// It seems to me that using the job ID in the reservation is acceptable since each job can only have one outstanding reservation. // It seems to me that using the job ID in the reservation is acceptable since each job can only have one outstanding reservation.
// job.MsgId = randSeq(20) // job.MsgId = randSeq(20)
@@ -173,7 +174,7 @@ func (mq *MemoryMQ) Reserve(ctx context.Context) (*models.Task, error) {
} }
_, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID}) _, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID})
log.Println("reserved") log.Println("Reserved")
return job, mq.pushTimeout(job) return job, mq.pushTimeout(job)
} }
@@ -187,8 +188,7 @@ func (mq *MemoryMQ) Delete(ctx context.Context, job *models.Task) error {
return errors.New("Not reserved") return errors.New("Not reserved")
} }
log.Println("delete")
delete(mq.Timeouts, job.ID) delete(mq.Timeouts, job.ID)
log.Println("deleted") log.Println("Deleted")
return nil return nil
} }

7
api/mqs/redis.go
View File

@@ -211,7 +211,8 @@ func (mq *RedisMQ) delayTask(conn redis.Conn, job *models.Task) (*models.Task, e
func (mq *RedisMQ) Push(ctx context.Context, job *models.Task) (*models.Task, error) { func (mq *RedisMQ) Push(ctx context.Context, job *models.Task) (*models.Task, error) {
_, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID}) _, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID})
defer log.Println("pushed") defer log.Println("Pushed to MQ")
conn := mq.pool.Get() conn := mq.pool.Get()
defer conn.Close() defer conn.Close()
@@ -280,14 +281,14 @@ func (mq *RedisMQ) Reserve(ctx context.Context) (*models.Task, error) {
} }
_, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID}) _, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID})
log.Println("reserved") log.Println("Reserved")
return &job, nil return &job, nil
} }
func (mq *RedisMQ) Delete(ctx context.Context, job *models.Task) error { func (mq *RedisMQ) Delete(ctx context.Context, job *models.Task) error {
_, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID}) _, log := common.LoggerWithFields(ctx, logrus.Fields{"call_id": job.ID})
defer log.Println("deleted") defer log.Println("Deleted")
conn := mq.pool.Get() conn := mq.pool.Get()
defer conn.Close() defer conn.Close()