Merge branch 'master' of github.com:ask/kombu

Conflicts:
	kombu/transport/mongodb.py
This commit is contained in:
Ask Solem 2011-04-21 18:33:15 +02:00
commit a10c9ee44b
1 changed files with 3 additions and 2 deletions

View File

@ -11,8 +11,9 @@ MongoDB transport.
"""
from Queue import Empty
from anyjson import serialize, deserialize
import pymongo
from pymongo import errors
from anyjson import serialize, deserialize
from pymongo.connection import Connection
from kombu.transport import virtual
@ -32,7 +33,7 @@ class Channel(virtual.Channel):
def _get(self, queue):
try:
msg = self.client.database.command("findandmodify",
"messages", query={"queue": queue}, remove=True)
"messages", query={"queue": queue}, sort={'_id' : pymongo.ASCENDING }, remove=True)
except errors.OperationFailure, exc:
if "No matching object found" in exc.args[0]:
raise Empty()