Skip to content

Commit e643949

Browse files
Bugfix - SUP
Add prevent database from connecting if connection is already established
1 parent 151eaa5 commit e643949

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

lua/msync/server/sv_modules.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ function MSync.enableModule( module )
9898
if MSync.modules[module] then
9999
MSync.log(MSYNC_DBG_DEBUG, "Module \"" .. module .. "\" enabled?: " .. tostring(MSync.settings.data.enabledModules[module]))
100100
if MSync.settings.data.enabledModules[module] then
101-
if not MSync.DBServer:ping() then
101+
if MSync.DBServer:ping() then
102102
local initTransaction = MSync.DBServer:createTransaction()
103103

104104
MSync.modules[module].init(initTransaction)

lua/msync/server/sv_net.lua

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,16 @@ net.Receive("msync.connectDB", function(len, ply)
189189
MSync.log(MSYNC_DBG_DEBUG, "Net: msync.connectDB. Ply.: " .. ply:Nick())
190190
if not ply:query("msync.connectDB") then return end
191191

192-
MSync.mysql.initialize()
192+
if MSync.DBServer then
193+
if not MSync.DBServer:ping() then
194+
MSync.mysql.initialize()
195+
else
196+
MSync.net.sendMessage(ply, "error", "The database is already connected!")
197+
MSync.log(MSYNC_DBG_DEBUG, "Aborted database connect because connection is already established")
198+
end
199+
else
200+
MSync.mysql.initialize()
201+
end
193202
end )
194203

195204
--[[

0 commit comments

Comments
 (0)