Add basic multiple beanstalkd support

jack/beanstalk/client.py

@@ -7,8 +7,14 @@
 class Client(object):
     """ A simple proxy object over the default client """
 
-    def __init__(self):
-        self.conn = Connection(settings.BEANSTALK_HOST, settings.BEANSTALK_PORT)
+    def __init__(self, request):
+        if hasattr(request, 'connection'):
+            self.conn = Connection(request.connection[0], request.connection[1])
+        elif settings.BEANSTALK_SERVERS:
+            server = settings.BEANSTALK_SERVERS[0]
+            self.conn = Connection(server[0], server[1])
+        else:
+            raise Exception("No servers defined.")
 
     def __getattr__(self, name):
         return getattr(self.conn, name) 

jack/beanstalk/multiple_beanstalk.py

@@ -0,0 +1,17 @@
+from django.conf import settings
+
+class Middleware(object):
+    def process_request(self, request):
+        if 'conn' not in request.COOKIES:
+            return
+
+        conn_id = int(request.COOKIES['conn'])
+        request.connection = settings.BEANSTALK_SERVERS[conn_id]
+
+def ContextProcessor(request):
+    if 'conn' not in request.COOKIES:
+        conn_id = None
+    else:
+        conn_id = int(request.COOKIES['conn'])
+    return {'connections':settings.BEANSTALK_SERVERS,'conn_id':conn_id}
+

jack/beanstalk/templates/beanstalk/base.html

@@ -98,6 +98,27 @@ <h1 style="float: left;font-size: 25px;">
         <span style="float: right">
             welcome {{ user }} | 
             <a href="/accounts/logout">logout</a>
+            <br><span>
+                <select id="change_connection">
+                    {% for host, port in connections %}
+                    <option value="{{forloop.counter0}}"
+                            {% if conn_id == forloop.counter0 %}
+                                selected="selected"
+                            {% endif %}>
+                        {{host}}:{{port}}
+                    </option>
+                    {% endfor %}
+                </select>
+                <script>
+                    (function(){
+                        var sel = document.getElementById('change_connection');
+                        sel.onchange = function(){
+                            document.cookie='conn='+sel.value;
+                            location.reload();
+                        };
+                    })();
+                </script>
+            </span>
         </span>
 
        <div style="clear: both;"></div>

jack/beanstalk/views.py

@@ -21,7 +21,7 @@ def _multiget(data, keys, default=None):
 @login_required
 def index(request):
     try:
-        client = Client()
+        client = Client(request)
     except ConnectionError:
         return render_unavailable()
 
@@ -62,7 +62,7 @@ def stats_table(request):
 @login_required
 def tube_stats(request, tube=None):
     try:
-        client = Client()
+        client = Client(request)
     except ConnectionError:
         return render_unavailable()
 
@@ -85,7 +85,7 @@ def tube_stats(request, tube=None):
 @login_required
 def tube_stats_table(request, tube=None):
     try:
-        client = Client()
+        client = Client(request)
     except ConnectionError:
         return render_unavailable()
 
@@ -107,7 +107,7 @@ def put(request):
         if form.is_valid():
 
             try:
-                client = Client()
+                client = Client(request)
             except ConnectionError:
                 return render_unavailable()
 
@@ -135,7 +135,7 @@ def inspect(request, id=None, tube_prefix='', tube=''):
         id = None
 
     try:
-        client = Client()
+        client = Client(request)
     except ConnectionError:
         return render_unavailable()
 
@@ -162,7 +162,7 @@ def inspect(request, id=None, tube_prefix='', tube=''):
 
 def _peek_if(request, status, tube):
     try:
-        client = Client()
+        client = Client(request)
     except ConnectionError:
         return render_unavailable()
 
@@ -205,7 +205,7 @@ def _redirect_to_referer_or(request, dest):
 @login_required
 def job_delete(request, id):
     try:
-        client = Client()
+        client = Client(request)
         job = client.peek(int(id))
 
         if job is not None:
@@ -219,7 +219,7 @@ def job_delete(request, id):
 @login_required
 def job_kick(request, id):
     try:
-        client = Client()
+        client = Client(request)
         client.use(request.POST['tube'])
         # The argument to kick is number of jobs not jobId, by default one job
         # is kicked.

jack/settings.py

@@ -22,9 +22,6 @@
     }
 }
 
-BEANSTALK_HOST = 'localhost'
-BEANSTALK_PORT = 11300
-
 LOGIN_REDIRECT_URL = '/'
 
 FLASH_IGNORE_MEDIA = True
@@ -101,6 +98,15 @@
     'beanstalk',
 )
 
+### MULTIPLE BEANSTALKD SUPPORT
+BEANSTALK_SERVERS = (
+)
+from django.conf import global_settings
+MIDDLEWARE_CLASSES += ('beanstalk.multiple_beanstalk.Middleware',)
+TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
+    'beanstalk.multiple_beanstalk.ContextProcessor',
+)
+
 try:
     from local_settings import *
 except ImportError: