Skip to content

Commit

Permalink
flakes
Browse files Browse the repository at this point in the history
  • Loading branch information
ask committed Jan 13, 2014
1 parent c9501fe commit 26bf9fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
10 changes: 6 additions & 4 deletions kombu/transport/mongodb.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,12 @@ def _parse_uri(self, scheme='mongodb://'):
if dbname in ('/', None):
dbname = 'kombu_default'

options = {'auto_start_request': True,
'ssl': client.ssl,
'connectTimeoutMS': int(client.connect_timeout * 1000)
if client.connect_timeout else None}
options = {
'auto_start_request': True,
'ssl': client.ssl,
'connectTimeoutMS': (int(client.connect_timeout * 1000)
if client.connect_timeout else None),
}
options.update(client.transport_options)
options.update(parsed['options'])

Expand Down
1 change: 1 addition & 0 deletions kombu/transport/redis.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ def get_redis_error_classes():
class MutexHeld(Exception):
pass


@contextmanager
def Mutex(client, name, expire):
lock_id = uuid()
Expand Down

0 comments on commit 26bf9fa

Please sign in to comment.