Skip to content

Commit 79319c9

Browse files
author
Matt George
committed
slight changes to the resweb connections
connections were being created for every new view so now only one connection is created for the module
1 parent d02f602 commit 79319c9

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

pyres/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,12 @@ def remove_queue(self, queue):
173173
self.redis.srem('resque:queues',queue)
174174
del self.redis['resque:queue:%s' % queue]
175175

176+
def close(self):
177+
"""
178+
close the underlying redis connection
179+
"""
180+
self.redis.disconnect()
181+
176182
@classmethod
177183
def encode(cls, item):
178184
return simplejson.dumps(item)

resweb/server.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Worker
1515
)
1616

17-
HOST = "localhost:6379"
17+
HOST = ResQ("localhost:6379")
1818
MY_ROOT = os.path.join(os.path.dirname(__file__), 'media')
1919
#resq = ResQ(HOST)
2020

resweb/views.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ class ResWeb(pystache.View):
99
template_path = TEMPLATE_PATH
1010
def __init__(self, host):
1111
super(ResWeb, self).__init__()
12-
self.resq = ResQ(host)
12+
self.resq = host
1313
def media_folder(self):
1414
return '/media/'
15+
def close(self):
16+
self.resq.close()
17+
1518
def address(self):
1619
return '%s:%s' % (self.resq.redis.host,self.resq.redis.port)
1720
def version(self):

scripts/pyres_web

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
from resweb import server
3-
from itty import *
3+
from itty import run_itty
44
def main():
55
from optparse import OptionParser
66
usage = "usage: %prog [options]"
@@ -16,7 +16,8 @@ def main():
1616
parser.add_option("--dsn",dest="dsn",help="redis server to display")
1717
(options,args) = parser.parse_args()
1818
if options.dsn:
19-
server.HOST = options.dsn
19+
from pyres import ResQ
20+
server.HOST = ResQ(options.dsn)
2021
run_itty(host=options.host, port=options.port)
2122

2223
if __name__ == "__main__":

0 commit comments

Comments
 (0)