Skip to content

Commit

Permalink
Drop trailing whitespace.
Browse files Browse the repository at this point in the history
  • Loading branch information
@b4hand
b4hand committed Jul 31, 2015
1 parent 279b318 commit b82ddf9
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 72 deletions.
22 changes: 11 additions & 11 deletions base.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,14 @@ end
-- If no group is provided, this returns a JSON blob of the counts of the
-- various groups of failures known. If a group is provided, it will report up
-- to `limit` from `start` of the jobs affected by that issue.
--
--
-- # If no group, then...
-- {
-- 'group1': 1,
-- 'group2': 5,
-- ...
-- }
--
--
-- # If a group is provided, then...
-- {
-- 'total': 20,
Expand Down Expand Up @@ -119,9 +119,9 @@ end
-------------------------------------------------------------------------------
-- Return all the job ids currently considered to be in the provided state
-- in a particular queue. The response is a list of job ids:
--
--
-- [
-- jid1,
-- jid1,
-- jid2,
-- ...
-- ]
Expand Down Expand Up @@ -167,7 +167,7 @@ end
-- associated with that id, and 'untrack' stops tracking it. In this context,
-- tracking is nothing more than saving the job to a list of jobs that are
-- considered special.
--
--
-- {
-- 'jobs': [
-- {
Expand Down Expand Up @@ -252,7 +252,7 @@ function Qless.tag(now, command, ...)
tags = cjson.decode(tags)
local _tags = {}
for i,v in ipairs(tags) do _tags[v] = true end

-- Otherwise, add the job to the sorted set with that tags
for i=2,#arg do
local tag = arg[i]
Expand All @@ -263,7 +263,7 @@ function Qless.tag(now, command, ...)
redis.call('zadd', 'ql:t:' .. tag, now, jid)
redis.call('zincrby', 'ql:tags', 1, tag)
end

redis.call('hset', QlessJob.ns .. jid, 'tags', cjson.encode(tags))
return tags
else
Expand All @@ -278,18 +278,18 @@ function Qless.tag(now, command, ...)
tags = cjson.decode(tags)
local _tags = {}
for i,v in ipairs(tags) do _tags[v] = true end

-- Otherwise, add the job to the sorted set with that tags
for i=2,#arg do
local tag = arg[i]
_tags[tag] = nil
redis.call('zrem', 'ql:t:' .. tag, jid)
redis.call('zincrby', 'ql:tags', -1, tag)
end

local results = {}
for i,tag in ipairs(tags) do if _tags[tag] then table.insert(results, tag) end end

redis.call('hset', QlessJob.ns .. jid, 'tags', cjson.encode(results))
return results
else
Expand Down Expand Up @@ -416,7 +416,7 @@ function Qless.cancel(...)
redis.call('del', QlessJob.ns .. jid .. '-history')
end
end

return arg
end

46 changes: 23 additions & 23 deletions job.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ end

-- Complete a job and optionally put it in another queue, either scheduled or
-- to be considered waiting immediately. It can also optionally accept other
-- jids on which this job will be considered dependent before it's considered
-- jids on which this job will be considered dependent before it's considered
-- valid.
--
-- The variable-length arguments may be pairs of the form:
--
--
-- ('next' , queue) : The queue to advance it to next
-- ('delay' , delay) : The delay for the next queue
-- ('depends', : Json of jobs it depends on in the new queue
Expand All @@ -75,7 +75,7 @@ function QlessJob:complete(now, worker, queue, raw_data, ...)
-- Read in all the optional parameters
local options = {}
for i = 1, #arg, 2 do options[arg[i]] = arg[i + 1] end

-- Sanity check on optional args
local nextq = options['next']
local delay = assert(tonumber(options['delay'] or 0))
Expand Down Expand Up @@ -168,15 +168,15 @@ function QlessJob:complete(now, worker, queue, raw_data, ...)
if redis.call('zscore', 'ql:queues', nextq) == false then
redis.call('zadd', 'ql:queues', now, nextq)
end

redis.call('hmset', QlessJob.ns .. self.jid,
'state', 'waiting',
'worker', '',
'failure', '{}',
'queue', nextq,
'expires', 0,
'remaining', tonumber(retries))

if (delay > 0) and (#depends == 0) then
queue_obj.scheduled.add(now + delay, self.jid)
return 'scheduled'
Expand Down Expand Up @@ -224,18 +224,18 @@ function QlessJob:complete(now, worker, queue, raw_data, ...)
'queue', '',
'expires', 0,
'remaining', tonumber(retries))

-- Do the completion dance
local count = Qless.config.get('jobs-history-count')
local time = Qless.config.get('jobs-history')

-- These are the default values
count = tonumber(count or 50000)
time = tonumber(time or 7 * 24 * 60 * 60)

-- Schedule this job for destructination eventually
redis.call('zadd', 'ql:completed', now, self.jid)

-- Now look at the expired job data. First, based on the current time
local jids = redis.call('zrangebyscore', 'ql:completed', 0, now - time)
-- Any jobs that need to be expired... delete
Expand All @@ -251,7 +251,7 @@ function QlessJob:complete(now, worker, queue, raw_data, ...)
end
-- And now remove those from the queued-for-cleanup queue
redis.call('zremrangebyscore', 'ql:completed', 0, now - time)

-- Now take the all by the most recent 'count' ids
jids = redis.call('zrange', 'ql:completed', 0, (-1-count))
for index, jid in ipairs(jids) do
Expand All @@ -265,7 +265,7 @@ function QlessJob:complete(now, worker, queue, raw_data, ...)
redis.call('del', QlessJob.ns .. jid .. '-history')
end
redis.call('zremrangebyrank', 'ql:completed', 0, (-1-count))

-- Alright, if this has any dependents, then we should go ahead
-- and unstick those guys.
for i, j in ipairs(redis.call(
Expand All @@ -289,10 +289,10 @@ function QlessJob:complete(now, worker, queue, raw_data, ...)
end
end
end

-- Delete our dependents key
redis.call('del', QlessJob.ns .. self.jid .. '-dependents')

return 'complete'
end
end
Expand All @@ -303,14 +303,14 @@ end
-- specific message. By `group`, we mean some phrase that might be one of
-- several categorical modes of failure. The `message` is something more
-- job-specific, like perhaps a traceback.
--
--
-- This method should __not__ be used to note that a job has been dropped or
-- has failed in a transient way. This method __should__ be used to note that
-- a job has something really wrong with it that must be remedied.
--
--
-- The motivation behind the `group` is so that similar errors can be grouped
-- together. Optionally, updated data can be provided for the job. A job in
-- any state can be marked as failed. If it has been given to a worker as a
-- any state can be marked as failed. If it has been given to a worker as a
-- job, then its subsequent requests to heartbeat or complete that job will
-- fail. Failed jobs are kept until they are canceled or completed.
--
Expand Down Expand Up @@ -381,7 +381,7 @@ function QlessJob:fail(now, worker, group, message, data)
queue_obj.locks.remove(self.jid)
queue_obj.scheduled.remove(self.jid)

-- The reason that this appears here is that the above will fail if the
-- The reason that this appears here is that the above will fail if the
-- job doesn't exist
if data then
redis.call('hset', QlessJob.ns .. self.jid, 'data', cjson.encode(data))
Expand Down Expand Up @@ -418,7 +418,7 @@ end
-- Throws an exception if:
-- - the worker is not the worker with a lock on the job
-- - the job is not actually running
--
--
-- Otherwise, it returns the number of retries remaining. If the allowed
-- retries have been exhausted, then it is automatically failed, and a negative
-- number is returned.
Expand All @@ -431,7 +431,7 @@ function QlessJob:retry(now, queue, worker, delay, group, message)
assert(worker, 'Retry(): Arg "worker" missing')
delay = assert(tonumber(delay or 0),
'Retry(): Arg "delay" not a number: ' .. tostring(delay))

-- Let's see what the old priority, and tags were
local oldqueue, state, retries, oldworker, priority, failure = unpack(
redis.call('hmget', QlessJob.ns .. self.jid, 'queue', 'state',
Expand Down Expand Up @@ -464,7 +464,7 @@ function QlessJob:retry(now, queue, worker, delay, group, message)
-- queue it's in
local group = group or 'failed-retries-' .. queue
self:history(now, 'failed', {['group'] = group})

redis.call('hmset', QlessJob.ns .. self.jid, 'state', 'failed',
'worker', '',
'expires', '')
Expand All @@ -488,7 +488,7 @@ function QlessJob:retry(now, queue, worker, delay, group, message)
['worker'] = unpack(self:data('worker'))
}))
end

-- Add this type of failure to the list of failures
redis.call('sadd', 'ql:failures', group)
-- And add this particular instance to the failed types
Expand Down Expand Up @@ -640,11 +640,11 @@ function QlessJob:heartbeat(now, worker, data)
redis.call('hmset', QlessJob.ns .. self.jid,
'expires', expires, 'worker', worker)
end

-- Update hwen this job was last updated on that worker
-- Add this job to the list of jobs handled by this worker
redis.call('zadd', 'ql:w:' .. worker .. ':jobs', expires, self.jid)

-- And now we should just update the locks
local queue = Qless.queue(
redis.call('hget', QlessJob.ns .. self.jid, 'queue'))
Expand Down
Loading

0 comments on commit b82ddf9

Please sign in to comment.