Skip to content
This repository was archived by the owner on Jan 10, 2019. It is now read-only.

Fix contract.txt and remove some superfluous whitespace #18

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix contract.txt and remove some superfluous whitespace #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd0b460
remove superfluous whitespace
mbra May 24, 2012
7fcb520
fix docs - high priority Job.put() also increments feed.publishes:[feed]
mbra Jun 21, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion contract.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ Job:
// id = generated uuid
MULTI
RPUSH feed.ids:[feed] [id]
INCR feed.publishes:[feed]
HSET feed.items:[feed] [id] [item]
ZADD feed.published:[feed] [utc epoch milliseconds] [id]
EXEC
Expand Down Expand Up @@ -284,4 +285,4 @@ Job:
LPUSH feed.ids:[feed] [key]

check claimed jobs to see if any have been claimed too long and "Cancel" or "Stall" them
publish stats to a feed
publish stats to a feed
20 changes: 10 additions & 10 deletions thoonk/feeds/job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ def __init__(self, thoonk, feed):
self.feed_claimed = 'feed.claimed:%s' % feed
self.feed_stalled = 'feed.stalled:%s' % feed
self.feed_running = 'feed.running:%s' % feed
self.job_finish = 'job.finish:%s' % feed

self.job_finish = 'job.finish:%s' % feed

def get_channels(self):
return (self.feed_publishes, self.feed_claimed, self.feed_stalled,
Expand Down Expand Up @@ -127,7 +127,7 @@ def _retract(pipe):
pipe.srem(self.feed_stalled, id)
pipe.zrem(self.feed_claimed, id)
pipe.lrem(self.feed_ids, 1, id)

self.redis.transaction(_retract, self.feed_items)

def put(self, item, priority=False):
Expand Down Expand Up @@ -172,7 +172,7 @@ def get(self, timeout=0):
Arguments:
timeout -- Optional time in seconds to wait before
raising an exception.

Returns:
id -- The id of the job
job -- The job content
Expand All @@ -188,14 +188,14 @@ def get(self, timeout=0):
pipe.hget(self.feed_items, id)
pipe.hget(self.feed_cancelled, id)
result = pipe.execute()

self.thoonk._publish(self.feed_claimed, (id,))

return id, result[1], 0 if result[2] is None else int(result[2])

def get_failure_count(self, id):
return int(self.redis.hget(self.feed_cancelled, id) or 0)

NO_RESULT = []
def finish(self, id, result=NO_RESULT):
"""
Expand All @@ -216,7 +216,7 @@ def _finish(pipe):
if result is not self.NO_RESULT:
self.thoonk._publish(self.job_finish, (id, result), pipe)
pipe.hdel(self.feed_items, id)

self.redis.transaction(_finish, self.feed_claimed)

def cancel(self, id):
Expand All @@ -233,7 +233,7 @@ def _cancel(pipe):
pipe.hincrby(self.feed_cancelled, id, 1)
pipe.lpush(self.feed_ids, id)
pipe.zrem(self.feed_claimed, id)

self.redis.transaction(_cancel, self.feed_claimed)

def stall(self, id):
Expand All @@ -253,7 +253,7 @@ def _stall(pipe):
pipe.hdel(self.feed_cancelled, id)
pipe.sadd(self.feed_stalled, id)
pipe.zrem(self.feed_published, id)

self.redis.transaction(_stall, self.feed_claimed)

def retry(self, id):
Expand All @@ -270,7 +270,7 @@ def _retry(pipe):
pipe.srem(self.feed_stalled, id)
pipe.lpush(self.feed_ids, id)
pipe.zadd(self.feed_published, **{id: time.time()})

results = self.redis.transaction(_retry, self.feed_stalled)
if not results[0]:
return # raise exception?
Expand Down