Merge remote branch 'binarydud/master'

chawco · chawco · commit 89b05b90caab · 2010-11-11T10:26:09.000-05:00
Conflicts:
	setup.py
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -5,5 +5,6 @@
 * dsc
 * Alex Ezell
 * Michael Russo
+* Whit Morris
 
 Inspired by Resque, by Chris Wanstrath
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,13 @@
+## 0.9.1 (2010-10-15)
+* fixing issues #45, #46.
+	* #45 - resweb not working in chrome
+	* #46 - delayed_queue_schedule_size() returns incorrect value
+* updated version requirement for redis-py
+* added Failure docs from Alex._
+
+## 0.9 (2010-08-05)
+* added better logging to the project
+
 ## 0.8 (2010-04-24)
 * added the pyres_manager and the horde module. This allows a more prefork like model for processing jobs.
 * setproctitle usage. Allows better process titles when viewing via ps
diff --git a/docs/source/failures.rst b/docs/source/failures.rst
@@ -0,0 +1,17 @@
+Failures
+===============
+
+Pyres provides a ``BaseBackend`` for handling failed jobs. You can subclass
+this backend to store failed jobs in any system you like.
+
+Currently, the only provided backend is a ``RedisBackend`` which will store
+your failed jobs into a special *failed* queue for later processing or reenqueueing.
+
+Here's a simple example::
+
+	>>> from pyres import failure
+	>>> from pyres.job import Job
+	>>> from pyres import ResQ
+	>>> r = Resq()
+	>>> job = Job.reserve('basic',r)
+	>>> job.fail("problem")
diff --git a/pyres/__init__.py b/pyres/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.9'
+__version__ = '0.9.1'
 
 from redis import Redis
 import pyres.json_parser as json
@@ -244,8 +244,12 @@ def delayed_timestamp_peek(self, timestamp, start, count):
         return self.list_range('resque:delayed:%s' % timestamp, start, count)
         
     def delayed_queue_schedule_size(self):
-        return self.redis.zcard('resque:delayed_queue_schedule')
-    
+        size = 0
+        length = self.redis.zcard('resque:delayed_queue_schedule')
+        for i in self.redis.zrange('resque:delayed_queue_schedule',0,length):
+            size += self.delayed_timestamp_size(i)
+        return size
+        
     def delayed_timestamp_size(self, timestamp):
         #key = int(time.mktime(timestamp.timetuple()))
         return self.redis.llen("resque:delayed:%s" % timestamp)
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 simplejson==2.0.9
 itty==0.6.2
-redis==1.34.1
+redis>=1.34.1
 pystache==0.1.0
 setproctitle==1.0
diff --git a/resweb/templates/header.mustache b/resweb/templates/header.mustache
@@ -4,7 +4,7 @@
   <title>pyres.</title>
   <link href="{{media_folder}}reset.css" media="screen" rel="stylesheet" type="text/css">
   <link href="{{media_folder}}style.css" media="screen" rel="stylesheet" type="text/css">
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.0/jquery.min.js" type="text/javascript"</script>
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.0/jquery.min.js" type="text/javascript"></script>
 </head>
 <body>
   <div class="header">
@@ -25,4 +25,4 @@
   {{/sub_nav}}
   </ul>
   
-<div id="main">
+<div id="main">
diff --git a/setup.py b/setup.py
@@ -1,6 +1,7 @@
 from setuptools import setup, find_packages
 
-version='0.9'
+version='0.9.1'
+
 setup(
     name='pyres',
     version=version,
diff --git a/tests/test_schedule.py b/tests/test_schedule.py
@@ -22,11 +22,13 @@ def test_enqueue_at(self):
     def test_delayed_queue_schedule_size(self):
         d = datetime.datetime.now() + datetime.timedelta(days=1)
         d2 = d + datetime.timedelta(days=1)
+        d3 = d
         key = int(time.mktime(d.timetuple()))
         key2 = int(time.mktime(d2.timetuple()))
         self.resq.enqueue_at(d, Basic,"test1")
         self.resq.enqueue_at(d2, Basic,"test1")
-        assert self.resq.delayed_queue_schedule_size() == 2
+        self.resq.enqueue_at(d3, Basic,"test1")
+        assert self.resq.delayed_queue_schedule_size() == 3
     
     def test_delayed_timestamp_size(self):
         d = datetime.datetime.now() + datetime.timedelta(days=1)
