Permalink
Browse files

new redis driver connectionpool upgrade, syslogd startscript fix

  • Loading branch information...
1 parent 88be86a commit ccc54556c47ab0f5c9256073059ef1a118bafba8 @gleicon committed Feb 18, 2012
View
0 examples/rubyclient.rb → examples/test_comet_em.tb
File renamed without changes.
View
8 examples/test_xmlrpc.py
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-import xmlrpclib
-
-srv = xmlrpclib.Server("http://localhost:8888/xmlrpc")
-print "set:", srv.set("test", "tuna-boy")
-print "get:", srv.get("test")
View
4 src/restmq/collectd.py
@@ -119,9 +119,9 @@ def __init__(self, acl_file, redis_host, redis_port, redis_pool, redis_db):
log.msg("ERROR: Cannot load ACL file: %s" % e)
raise RuntimeError("Cannot load ACL file: %s" % e)
- db = cyclone.redis.lazyRedisConnectionPool(
+ db = cyclone.redis.lazyConnectionPool(
redis_host, redis_port,
- pool_size=redis_pool, db=redis_db)
+ poolsize=redis_pool, dbid=redis_db)
oper = core.RedisOperations(db)
View
4 src/restmq/syslogd.py
@@ -52,9 +52,9 @@ class SyslogdFactory(ServerFactory):
def __init__ (self, redis_host, redis_port, redis_pool, redis_db ):
- db = cyclone.redis.lazyRedisConnectionPool(
+ db = cyclone.redis.lazyConnectionPool(
redis_host, redis_port,
- pool_size=redis_pool, db=redis_db)
+ poolsize=redis_pool, dbid=redis_db)
self.oper = core.RedisOperations(db)
View
4 src/restmq/web.py
@@ -649,9 +649,9 @@ def __init__(self, acl_file, redis_host, redis_port, redis_pool, redis_db):
log.msg("ERROR: Cannot load ACL file: %s" % e)
raise RuntimeError("Cannot load ACL file: %s" % e)
- db = cyclone.redis.lazyRedisConnectionPool(
+ db = cyclone.redis.lazyConnectionPool(
redis_host, redis_port,
- pool_size=redis_pool, db=redis_db)
+ poolsize=redis_pool, dbid=redis_db)
oper = core.RedisOperations(db)
View
2 syslogd_restmq_server
@@ -24,7 +24,7 @@ LISTEN=192.168.0.179
# run in foreground, for testing
export PYTHONPATH=`dirname $0`:$PYTHONPATH
-exec twistd --pidfile=$PIDFILE --logfile=$LOGFILE -n syslogd $* --listen=$LISTEN
+exec twistd -n syslogd $*
# run in background, for production
# export PYTHONPATH=`dirname $0`:$PYTHONPATH

0 comments on commit ccc5455

Please sign in to comment.