badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added DATBASE_TIMEOUT constant to allow customizing database wait time

Browse source
This commit is contained in:
Matthew Barbour 2019-06-21 08:22:51 -05:00 committed by Shish
parent 6a6d73168b
commit 3fc0ba3a63
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/dbengine.php
View file

@ -74,7 +74,7 @@ class PostgreSQL extends DBEngine
} else { } else {
$db->exec("SET application_name TO 'shimmie [local]';"); $db->exec("SET application_name TO 'shimmie [local]';");
} }
$db->exec("SET statement_timeout TO 10000;"); $db->exec("SET statement_timeout TO ".DATABASE_TIMEOUT.";");
} }
public function scoreql_to_sql(string $data): string public function scoreql_to_sql(string $data): string

1
core/sys_config.php
View file

@ -27,6 +27,7 @@ function _d(string $name, $value): void
} }
_d("DATABASE_DSN", null); // string PDO database connection details _d("DATABASE_DSN", null); // string PDO database connection details
_d("DATABASE_KA", true); // string Keep database connection alive _d("DATABASE_KA", true); // string Keep database connection alive
_d("DATABASE_TIMEOUT", 10000); // string Keep database connection alive
_d("CACHE_DSN", null); // string cache connection details _d("CACHE_DSN", null); // string cache connection details
_d("DEBUG", false); // boolean print various debugging details _d("DEBUG", false); // boolean print various debugging details
_d("DEBUG_SQL", false); // boolean dump SQL queries to data/sql.log _d("DEBUG_SQL", false); // boolean dump SQL queries to data/sql.log

2
ext/rule34/main.php
View file

@ -73,7 +73,7 @@ class Rule34 extends Extension
global $database, $page, $user; global $database, $page, $user;
if ($user->can("delete_user")) { // deleting users can take a while if ($user->can("delete_user")) { // deleting users can take a while
$database->execute("SET statement_timeout TO 25000;"); $database->execute("SET statement_timeout TO ".(DATABASE_TIMEOUT+15000).";");
} }
if (function_exists("sd_notify_watchdog")) { if (function_exists("sd_notify_watchdog")) {