diff --git a/def.go b/def.go index f1c9671..c9e3818 100644 --- a/def.go +++ b/def.go @@ -318,12 +318,12 @@ type BotMsg struct { } type Job struct { - ID64 int64 - JobTypeID int32 - Trigger int64 - Timeout time.Time - UserID64 int64 - Payload []byte + ID64 int64 + JobTypeID64 int64 + Trigger int64 + Timeout time.Time + UserID64 int64 + Payload []byte } type JobPayloadGetHammerTime struct { diff --git a/job.go b/job.go index 3013e4e..b83e88e 100644 --- a/job.go +++ b/job.go @@ -153,13 +153,13 @@ func rescheduleJob(jobID64 int64, trigger int64, schedule time.Time) error { func loadCurrentJobs() ([]Job, error) { var ( - objId int64 - jobTypeId int32 - userID64 int64 - trigger int64 - timeout time.Time - payload []byte - jobs []Job + objId int64 + jobTypeID64 int64 + userID64 int64 + trigger int64 + timeout time.Time + payload []byte + jobs []Job ) t := time.Now().UTC() @@ -187,15 +187,15 @@ func loadCurrentJobs() ([]Job, error) { } for rows.Next() { - err = rows.Scan(&objId, &jobTypeId, &trigger, &userID64, &payload, &timeout) + err = rows.Scan(&objId, &jobTypeID64, &trigger, &userID64, &payload, &timeout) logOnError(err, "loadCurrentJobs : scan query rows") job := Job{ - ID64: objId, - JobTypeID: jobTypeId, - Trigger: trigger, - UserID64: userID64, - Payload: payload, - Timeout: timeout, + ID64: objId, + JobTypeID64: jobTypeID64, + Trigger: trigger, + UserID64: userID64, + Payload: payload, + Timeout: timeout, } jobs = append(jobs, job) } diff --git a/workers.go b/workers.go index e626a41..e37674d 100644 --- a/workers.go +++ b/workers.go @@ -548,7 +548,7 @@ func JobWorker(id int, jobs <-chan Job) { for j := range jobs { //log.Printf("JobWorker[%d] : Starting job %d (timeout : %s).\n", id, j.ID64, j.Timeout.Format(time.RFC3339)) if time.Now().UTC().Before(j.Timeout) { - switch j.JobTypeID { + switch j.JobTypeID64 { case cacheObjSubType[`job_rescan_msg`]: jobRescan(j) case cacheObjSubType[`job_set_done`]: @@ -582,7 +582,7 @@ func JobWorker(id int, jobs <-chan Job) { case cacheObjSubType[`job_get_hammer_time`]: jobGetHammerTime(j) default: - log.Printf("jobWorker["+strconv.Itoa(id)+"] : No handler for job type #%d.\n", j.JobTypeID) + log.Printf("jobWorker["+strconv.Itoa(id)+"] : No handler for job type #%d.\n", j.JobTypeID64) } } else { log.Printf("JobWorker[%d] : Job %d timed out.\n", id, j.ID64)