From b52089ede1a459733759c87e6dcbdf9b900c6538 Mon Sep 17 00:00:00 2001
From: Vincent Driessen <vincent@3rdcloud.com>
Date: Tue, 17 Dec 2013 12:26:29 +0100
Subject: [PATCH] Fix NameError.

This was the result of a faulty merge. I'm sorry.
---
 rq/worker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rq/worker.py b/rq/worker.py
index 8cf9d14..f72dc99 100644
--- a/rq/worker.py
+++ b/rq/worker.py
@@ -326,7 +326,7 @@ class Worker(object):
                 self.log.info('%s: %s (%s)' % (green(queue.name),
                     blue(job.description), job.id))
 
-                self.heartbeat((job.timeout or Queue.DEFAULT_TIMEOUT) + 60)
+                self.heartbeat((job.timeout or 180) + 60)
                 self.fork_and_perform_job(job)
                 self.heartbeat()