sipwise
/
lua-ngcp-kamailio
mirror of https://github.com/sipwise/lua-ngcp-kamailio.git
1
0
Fork 0
Code Issues Releases Wiki Activity

MT#9067 use one MySQL connection only on NGCP

Browse Source 
Don't close the connection, just the cursor.

We may need a ping function to test the connection.
https://github.com/keplerproject/luasql/pull/12
vseva/9067
Victor Seva 11 years ago
parent 1ff1867560
commit 6f8b67f4d5
9 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File

1
ngcp/cp.lua
Unescape View File

@ -97,7 +97,6 @@ NGCPContractPrefs_MT.__tostring = function ()
sr.log("dbg", string.format("no results for query:%s", query))
end
cur:close()
con:close()
xavp = self:xavp(level, result)
for k,v in pairs(defaults) do

1
ngcp/dp.lua
Unescape View File

@ -97,7 +97,6 @@ NGCPDomainPrefs_MT.__tostring = function ()
sr.log("dbg", string.format("no results for query:%s", query))
end
cur:close()
con:close()
xavp = self:xavp(level, result)
for k,v in pairs(defaults) do

11
ngcp/ngcp.lua
Unescape View File

@ -80,10 +80,13 @@ NGCPConfig_MT = { __index = NGCPConfig }
end
function NGCPConfig:getDBConnection()
local env = assert (luasql.mysql())
sr.log("dbg","connecting to mysql")
return env:connect( self.db_database,
self.db_username, self.db_pass, self.db_host, self.db_port)
if not self.con then
self.env = assert (luasql.mysql())
sr.log("dbg","connecting to mysql")
self.con = self.env:connect( self.db_database,
self.db_username, self.db_pass, self.db_host, self.db_port)
end
return self.con
end
function NGCPConfig:get_defaults(vtype)

1
ngcp/pp.lua
Unescape View File

@ -99,7 +99,6 @@ NGCPPeerPrefs_MT.__tostring = function ()
sr.log("dbg", string.format("no results for query:%s", query))
end
cur:close()
con:close()
xavp = self:xavp(level, result)
for k,v in pairs(defaults) do

1
ngcp/up.lua
Unescape View File

@ -97,7 +97,6 @@ NGCPUserPrefs_MT.__tostring = function ()
sr.log("dbg", string.format("no results for query:%s", query))
end
cur:close()
con:close()
xavp = self:xavp(level, result)
for k,v in pairs(defaults) do

12
tests/ngcp.lua
Unescape View File

@ -130,7 +130,6 @@ TestNGCP = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
self.con:close()
mc:replay()
local keys = self.ngcp:caller_usr_load("ae736f72-21d1-4ea6-a3ea-4d7f56b3887c")
@ -152,7 +151,6 @@ TestNGCP = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
self.con:close()
mc:replay()
local keys = self.ngcp:caller_usr_load(nil, "192.168.51.56")
@ -177,8 +175,7 @@ TestNGCP = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
self.con:close()
env:connect(c.db_database, c.db_username, c.db_pass, c.db_host, c.db_port) ;mc :returns(self.con)
self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur)
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
@ -188,7 +185,6 @@ TestNGCP = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
self.con:close()
mc:replay()
local keys = self.ngcp:caller_usr_load("ae736f72-21d1-4ea6-a3ea-4d7f56b3887c", "192.168.51.56")
@ -215,8 +211,7 @@ TestNGCP = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
self.con:close()
env:connect(c.db_database, c.db_username, c.db_pass, c.db_host, c.db_port) ;mc :returns(self.con)
self.con:execute("SELECT * FROM usr_preferences WHERE uuid ='ae736f72-21d1-4ea6-a3ea-4d7f56b3887c'") ;mc :returns(self.cur)
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
@ -225,7 +220,6 @@ TestNGCP = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
self.con:close()
mc:replay()
local keys = self.ngcp:callee_usr_load("ae736f72-21d1-4ea6-a3ea-4d7f56b3887c", "192.168.51.56")
@ -251,7 +245,6 @@ TestNGCP = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) --sst_refresh_method: "UPDATE_FALLBACK_INVITE"
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
self.con:close()
mc:replay()
local keys = self.ngcp:caller_peer_load("2")
@ -274,7 +267,6 @@ TestNGCP = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2")) --sst_refresh_method: "UPDATE_FALLBACK_INVITE"
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
self.con:close()
mc:replay()
local keys = self.ngcp:callee_peer_load("2")

2
tests/ngcp_dp.lua
Unescape View File

@ -101,7 +101,6 @@ TestNGCPDomainPrefs = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
con:close()
mc:replay()
local keys = self.d:caller_load("192.168.51.56")
@ -119,7 +118,6 @@ TestNGCPDomainPrefs = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.dp_vars:val("d_192_168_51_56"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
con:close()
mc:replay()
local keys = self.d:callee_load("192.168.51.56")

2
tests/ngcp_pp.lua
Unescape View File

@ -111,7 +111,6 @@ TestNGCPPeerPrefs = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
con:close()
mc:replay()
local keys = self.d:caller_load("2")
@ -131,7 +130,6 @@ TestNGCPPeerPrefs = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.pp_vars:val("p_2"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
con:close()
mc:replay()
local keys = self.d:callee_load("2")

2
tests/ngcp_up.lua
Unescape View File

@ -113,7 +113,6 @@ TestNGCPUserPrefs = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
con:close()
mc:replay()
local keys = self.d:caller_load("ae736f72-21d1-4ea6-a3ea-4d7f56b3887c")
@ -136,7 +135,6 @@ TestNGCPUserPrefs = {} --class
self.cur:fetch(mc.ANYARGS) ;mc :returns(self.up_vars:val("ae736f72_21d1_4ea6_a3ea_4d7f56b3887c"))
self.cur:fetch(mc.ANYARGS) ;mc :returns(nil)
self.cur:close()
con:close()
mc:replay()
local keys = self.d:callee_load("ae736f72-21d1-4ea6-a3ea-4d7f56b3887c")

Write Preview
Loading…
Cancel
Save