diff --git a/conf/balancer.config b/conf/balancer.config index 4c9291b7c..2ae215402 100644 --- a/conf/balancer.config +++ b/conf/balancer.config @@ -15,7 +15,7 @@ # along with this program. If not, see [global] -redis_server = 127.0.0.1:6379 #redis address hostort +redis_server = 127.0.0.1:6379 #redis address host:port redis_db = 10 # redis database number [balancer] @@ -25,7 +25,7 @@ rpc_encoding = gob # use JSON for RPC encoding [rater] enabled = true -listen = 127.0.0.1:1234 # listening address hostort, internal for internal communication only +listen = 127.0.0.1:1234 # listening address host:port, internal for internal communication only balancer = disabled # if defined it will register to balancer as worker rpc_encoding = gob # use JSON for RPC encoding diff --git a/conf/balancer_standalone.config b/conf/balancer_standalone.config index 2dec0685a..4165383d3 100644 --- a/conf/balancer_standalone.config +++ b/conf/balancer_standalone.config @@ -15,7 +15,7 @@ # along with this program. If not, see [global] -redis_server = 127.0.0.1:6379 #redis address hostort +redis_server = 127.0.0.1:6379 #redis address host:port redis_db = 10 # redis database number [balancer] diff --git a/conf/mediator.config b/conf/mediator.config index 9b3a59af9..0243c8c84 100644 --- a/conf/mediator.config +++ b/conf/mediator.config @@ -15,12 +15,12 @@ # along with this program. If not, see [global] -redis_server = 127.0.0.1:6379 #redis address hostort +redis_server = 127.0.0.1:6379 #redis address host:port redis_db = 10 # redis database number [rater] enabled = true -listen = 127.0.0.1:2001 # listening address hostort, internal for internal communication only +listen = 127.0.0.1:2001 # listening address host:port, internal for internal communication only balancer = disabled # if defined it will register to balancer as worker rpc_encoding = gob # use JSON for RPC encoding diff --git a/conf/rater.config b/conf/rater.config index c1ac6ad27..8c4c9a1e8 100644 --- a/conf/rater.config +++ b/conf/rater.config @@ -15,7 +15,7 @@ # along with this program. If not, see [global] -redis_server = 127.0.0.1:6379 #redis address hostort +redis_server = 127.0.0.1:6379 #redis address host:port redis_db = 10 # redis database number [rater] diff --git a/data/test.config b/data/test.config index c47240289..7a50b3a3c 100644 --- a/data/test.config +++ b/data/test.config @@ -17,7 +17,6 @@ [global] redis_server = test #redis address host:port redis_db = 1 # redis database number -redis_user = test redis_pass = test db_type = test # db_host = test # The host to connect to. Values that start with / are for UNIX domain sockets. diff --git a/timespans/storage_redis.go b/timespans/storage_redis.go index 0633fc992..c04ba890a 100644 --- a/timespans/storage_redis.go +++ b/timespans/storage_redis.go @@ -37,7 +37,7 @@ func NewRedisStorage(address string, db int, pass string) (*RedisStorage, error) address = "tcp:" + address } ndb := godis.New(address, db, pass) - ms := &MyMarshaler{} + ms := new(MyMarshaler) return &RedisStorage{db: ndb, dbNb: db, ms: ms}, nil }