diff rhodecode/lib/celerylib/__init__.py @ 679:d85b0948e539 rhodecode-0.0.1.0.2

fixed hooks broken symlink issue fixed python2.5 crash. fixed #58 missing graph.js bug Fixed tests to remove the forked repository when building enviroment version bump
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 11 Nov 2010 15:03:40 +0100
parents 14559eb34003
children 3d0661b8aaa4
line wrap: on
line diff
--- a/rhodecode/lib/celerylib/__init__.py	Wed Nov 10 19:25:44 2010 +0100
+++ b/rhodecode/lib/celerylib/__init__.py	Thu Nov 11 15:03:40 2010 +0100
@@ -12,7 +12,7 @@
 class ResultWrapper(object):
     def __init__(self, task):
         self.task = task
-        
+
     @LazyProperty
     def result(self):
         return self.task
@@ -23,15 +23,22 @@
         log.info('running task %s', t.task_id)
         return t
     except socket.error, e:
-        if  e.errno == 111:
+
+        try:
+            conn_failed = e.errno == 111
+        except AttributeError:
+            conn_failed = False
+
+        if  conn_failed:
             log.debug('Unable to connect to celeryd. Sync execution')
         else:
-            log.error(traceback.format_exc())    
+            log.debug('Unable to connect to celeryd. Sync execution')
+
     except KeyError, e:
             log.debug('Unable to connect to celeryd. Sync execution')
     except Exception, e:
         log.error(traceback.format_exc())
-    
+
     return ResultWrapper(task(*args, **kwargs))
 
 
@@ -39,7 +46,7 @@
     def __wrapper(func, *fargs, **fkwargs):
         params = list(fargs)
         params.extend(['%s-%s' % ar for ar in fkwargs.items()])
-            
+
         lockkey = 'task_%s' % \
             md5(str(func.__name__) + '-' + \
                 '-'.join(map(str, params))).hexdigest()
@@ -51,14 +58,14 @@
             return ret
         except LockHeld:
             log.info('LockHeld')
-            return 'Task with key %s already running' % lockkey   
+            return 'Task with key %s already running' % lockkey
 
-    return decorator(__wrapper, func)      
-            
+    return decorator(__wrapper, func)
+
+
 
-        
-        
-    
-    
-    
-  
+
+
+
+
+