Skip to content

Make DB_QUERY_RUNNING_TIME_LIMIT configurable for database query execution time #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dirkgomez wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make DB_QUERY_RUNNING_TIME_LIMIT configurable for database query execution time #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions config.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,13 @@
* @var string|null
*/
const DEBUG_LOG = DATA_ROOT . '/debug.log';

/**
* DB_QUERY_RUNNING_TIME_LIMIT
* Set the maximum time in seconds a database query is allowed to run.
* If a query takes longer than this, it will be aborted and an error will be returned
*
* Default: 30
* @var int
*/
const DB_QUERY_RUNNING_TIME_LIMIT = 30;
1 change: 1 addition & 0 deletions server/_inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class UserException extends \Exception {}
'TITLE' => 'My oPodSync server',
'DEBUG_LOG' => null,
'HTTP_SCHEME' => !empty($_SERVER['HTTPS']) || $_SERVER['SERVER_PORT'] == 443 ? 'https' : 'http',
'DB_QUERY_RUNNING_TIME_LIMIT' => 30,
];

foreach ($defaults as $const => $value) {
Expand Down
2 changes: 1 addition & 1 deletion server/lib/OPodSync/GPodder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ public function updateAllFeeds(bool $cli = false): void
$db = DB::getInstance();

foreach ($db->iterate($sql) as $row) {
@set_time_limit(30); // Extend running time;
@set_time_limit(DB_QUERY_RUNNING_TIME_LIMIT); // Extend running time;

if ($cli) {
printf("Updating %s\n", $row->url);
Expand Down