adam/Piwigo
1
0 Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-10-30 21:52:00 +01:00
Code Issues 657 Packages Projects Releases Wiki Activity

fixes #2333 avoid deadlock while waiting for user_cache rebuild

Browse Source
This commit is contained in:
plegall committed 2025-03-01 12:04:41 +01:00
1 parent 6489dceadf
commit 5eacda0d76
2 files changed
+21 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/functions_user.inc.php
+8 -2
View File
@@ -437,15 +437,21 @@ SELECT
list($nb_cache_lines) = pwg_db_fetch_row(pwg_query($query));
$logger_msg = $logger_msg_prefix.'user_cache generation waiting k='.$k.' ';
$waiting_time = get_elapsed_time($user_cache_waiting_start_time, get_moment());
if ($nb_cache_lines > 0)
{
$logger->info($logger_msg.'user_cache rebuilt, after waiting '.get_elapsed_time($user_cache_waiting_start_time, get_moment()));
$logger->info($logger_msg.'user_cache rebuilt, after waiting '.$waiting_time);
return getuserdata($user_id, false);
}
elseif (!pwg_unique_exec_is_running($cache_generation_token_name))
{
$logger->info($logger_msg.'user_cache rebuilt but has been reset since, give it another try, after waiting '.$waiting_time);
return getuserdata($user_id, true);
}
else
{
$logger->info($logger_msg.'user_cache not ready yet, after waiting '.get_elapsed_time($user_cache_waiting_start_time, get_moment()));
$logger->info($logger_msg.'user_cache not ready yet, after waiting '.$waiting_time);
}
}