From bd30889c1c0f8bef68b61f127dc707ab7ab1a8ad Mon Sep 17 00:00:00 2001 From: David Malchin Date: Sat, 8 Oct 2022 03:53:25 +0300 Subject: [PATCH] Improve comments --- server/events.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/events.lua b/server/events.lua index a4bc55d..80bdbcd 100644 --- a/server/events.lua +++ b/server/events.lua @@ -50,6 +50,7 @@ local function onPlayerConnecting(name, _, deferrals) local databaseTime = os.clock() local databasePromise = promise.new() + -- conduct database-dependant checks CreateThread(function() deferrals.update(string.format(Lang:t('info.checking_ban'), name)) local databaseSuccess, databaseError = pcall(function() @@ -74,6 +75,7 @@ local function onPlayerConnecting(name, _, deferrals) databasePromise:resolve() end) + -- wait for database to finish databasePromise:next(function() deferrals.update(string.format(Lang:t('info.join_server'), name)) deferrals.done() @@ -81,9 +83,10 @@ local function onPlayerConnecting(name, _, deferrals) deferrals.done(Lang:t('error.connecting_database_error')) print('^1' .. databaseError) end) - - while databasePromise.state == 0 do -- while database promise is pending - if os.clock() - databaseTime > 30 then -- if 30 seconds were spent waiting for the database + + -- if conducting checks for too long then raise error + while databasePromise.state == 0 do + if os.clock() - databaseTime > 30 then deferrals.done(Lang:t('error.connecting_database_timeout')) error(Lang:t('error.connecting_database_timeout')) break