From 6e5d0d16fee86b32f3dd9f2ab3b17ef50e2f7535 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 3 Mar 2018 15:58:36 +0100
Subject: [PATCH] Fixes timeout options
---
database/Config.php | 7 ++++---
qrs_config.default.php | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/database/Config.php b/database/Config.php
index b463be2..1f4d169 100644
--- a/database/Config.php
+++ b/database/Config.php
@@ -27,12 +27,13 @@ class Config
public static function createFromGlobals()
{
$options = [];
- if (defined(qrs_db_option_tsqueryfunction) && null !== qrs_db_option_tsqueryfunction)
+ if (defined('qrs_db_option_tsqueryfunction') && (null !== qrs_db_option_tsqueryfunction)) {
$options['tsqueryfunction'] = qrs_db_option_tsqueryfunction;
+ }
- $options['timeout'] = (defined(qrs_db_option_timeout) && null !== qrs_db_option_timeout) ? qrs_db_option_timeout : 5000;
+ $options['timeout'] = (defined('qrs_db_option_timeout') && (null !== qrs_db_option_timeout)) ? qrs_db_option_timeout : 5000;
- if (defined(qrs_db_connector) && null !== qrs_db_connector)
+ if (defined('qrs_db_connector') && null !== qrs_db_connector)
return new Config(qrs_path_prefix, qrs_db_connector, qrs_db_user, qrs_db_pass, qrs_backend, $options);
else
return new Config(qrs_path_prefix, 'pgsql:host=' . qrs_db_host . ';port=' . qrs_db_port . ';dbname=' . qrs_db_name . '', qrs_db_user, qrs_db_pass, qrs_backend, $options);
diff --git a/qrs_config.default.php b/qrs_config.default.php
index 5bc6425..9697bf3 100644
--- a/qrs_config.default.php
+++ b/qrs_config.default.php
@@ -11,7 +11,7 @@ define('qrs_db_pass', 'password');
define('qrs_db_option_tsqueryfunction', "plainto_tsquery('english', :query)");
// Timeout in milliseconds
-define('qrs_db_option_timeout', 5000);
+define('qrs_db_option_timeout', 1);
define('qrs_backend', 'pgsql-smart');
--
GitLab