Added redis db selection to setupRedis API method

Gruntfile.js

@@ -17,6 +17,7 @@ module.exports = function(grunt) {
 				options: {
 					process: function (content, srcpath) {
 						return content.replace(/\s*(\-\-)?\s*ngx\.log.*/g,'')
+							.replace(/\s*require.*debug\.var_dump.*/g,'')
 							.replace(/\s*(\-\-)?\s*var_dump.*/g,'');
 					}
 				}

README.md

@@ -12,7 +12,7 @@ Table of Contents
 * [Installation](#installation)
 * [Dependencies](#dependencies)
 * [Methods](#methods)
-	* [setupRedis](#setupredishost-port)
+	* [setupRedis](#setupredishost-port-db)
 	* [addConnection](#addconnectionsid-wampproto)
 	* [removeConnection](#removeconnectionregid)
 	* [receiveData](#receivedataregid-data)
@@ -95,7 +95,7 @@ Actually, you do not need to do anything. Just take any WAMP client and make a c
 Methods
 ========
 
-setupRedis(host, port)
+setupRedis(host, port, db)
 ------------------------------------------
 
 Configure and initialize connection to Redis server.
@@ -104,6 +104,7 @@ Parameters:
 
  * **host** - Redis server host or Redis unix socket path
  * **port** - Redis server port (in case of use network connection). Omit for socket connection.
+ * **db** - Redis database index to select
 
 Returns:
 

build/headers.lua

@@ -4,7 +4,7 @@
 -- Date: 16.03.14
 --
 
-ngx.header["Server"] = "wiola/Lua v0.1"
+ngx.header["Server"] = "wiola/Lua v0.3.1"
 
 local wsProto = ngx.req.get_headers()["Sec-WebSocket-Protocol"]
 

build/wiola.lua

@@ -8,13 +8,13 @@ local redisLib = require "resty.redis"
 local redis = redisLib:new()
 
 local _M = {
-	_VERSION = '0.2'
+	_VERSION = '0.3.1'
 }
 
 _M.__index = _M
 
 local wamp_features = {
-	agent = "wiola/Lua v0.2",
+	agent = "wiola/Lua v0.3.1",
 	roles = {
 		broker = {
 			features = {
@@ -92,15 +92,24 @@ end
 --
 -- host - redis host or unix socket
 -- port - redis port in case of network use or nil
+-- db   - redis database to select
 --
 -- returns connection flag, error description
 --
-function _M.setupRedis(host, port)
+function _M.setupRedis(host, port, db)
+	local redisOk, redisErr
+
 	if port == nil then
-		return redis:connect(host)
+		redisOk, redisErr = redis:connect(host)
 	else
-		return redis:connect(host, port)
+		redisOk, redisErr = redis:connect(host, port)
+	end
+
+	if redisOk and db ~= nil then
+		redis:select(db)
 	end
+
+	return redisOk, redisErr
 end
 
 --

src/wiola/headers.lua

@@ -4,7 +4,7 @@
 -- Date: 16.03.14
 --
 
-ngx.header["Server"] = "wiola/Lua v0.1"
+ngx.header["Server"] = "wiola/Lua v0.3.1"
 
 local wsProto = ngx.req.get_headers()["Sec-WebSocket-Protocol"]
 

src/wiola/wiola.lua

@@ -7,14 +7,16 @@
 local redisLib = require "resty.redis"
 local redis = redisLib:new()
 
+require "debug.var_dump"
+
 local _M = {
-	_VERSION = '0.2'
+	_VERSION = '0.3.1'
 }
 
 _M.__index = _M
 
 local wamp_features = {
-	agent = "wiola/Lua v0.2",
+	agent = "wiola/Lua v0.3.1",
 	roles = {
 		broker = {
 			features = {
@@ -93,15 +95,24 @@ end
 --
 -- host - redis host or unix socket
 -- port - redis port in case of network use or nil
+-- db   - redis database to select
 --
 -- returns connection flag, error description
 --
-function _M.setupRedis(host, port)
+function _M.setupRedis(host, port, db)
+	local redisOk, redisErr
+
 	if port == nil then
-		return redis:connect(host)
+		redisOk, redisErr = redis:connect(host)
 	else
-		return redis:connect(host, port)
+		redisOk, redisErr = redis:connect(host, port)
 	end
+
+	if redisOk and db ~= nil then
+		redis:select(db)
+	end
+
+	return redisOk, redisErr
 end
 
 --