diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-23 20:12:12 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-03-06 20:16:16 -0500 |
| commit | d69a7c620a08d1866a24033ef43646a4bbfc9925 (patch) | |
| tree | 04e1dfac1a0a9be42c61bebb85c9c83a073d66ec /phpBB/includes | |
| parent | f08cbc73de208dab29737ab53db3af8a6a2d97fc (diff) | |
| download | forums-d69a7c620a08d1866a24033ef43646a4bbfc9925.tar forums-d69a7c620a08d1866a24033ef43646a4bbfc9925.tar.gz forums-d69a7c620a08d1866a24033ef43646a4bbfc9925.tar.bz2 forums-d69a7c620a08d1866a24033ef43646a4bbfc9925.tar.xz forums-d69a7c620a08d1866a24033ef43646a4bbfc9925.zip | |
[ticket/10057] Report postgres db connection errors.
Addresses two issues:
1. When pgsql extension is missing, @pg_connect would silently
abort execution. Check for pg_connect existence before calling it,
same with pg_pconnect.
2. When connection fails, the error reported by php is discarded.
User is shown the failure message without the reason for failure,
making debugging difficult. Collect the error (if any) via a
temporarily installed error handler, and display it if connection
failed.
PHPBB3-10057
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/db/postgres.php | 15 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 44 |
2 files changed, 58 insertions, 1 deletions
diff --git a/phpBB/includes/db/postgres.php b/phpBB/includes/db/postgres.php index 4360c790a1..29e15143bc 100644 --- a/phpBB/includes/db/postgres.php +++ b/phpBB/includes/db/postgres.php @@ -81,13 +81,25 @@ class dbal_postgres extends dbal if ($this->persistency) { + if (!function_exists('pg_pconnect')) + { + return $this->sql_error('pg_pconnect does not exist'); + } + phpbb_start_error_collection(); $this->db_connect_id = (!$new_link) ? @pg_pconnect($connect_string) : @pg_pconnect($connect_string, PGSQL_CONNECT_FORCE_NEW); } else { + if (!function_exists('pg_pconnect')) + { + return $this->sql_error('pg_connect does not exist'); + } + phpbb_start_error_collection(); $this->db_connect_id = (!$new_link) ? @pg_connect($connect_string) : @pg_connect($connect_string, PGSQL_CONNECT_FORCE_NEW); } + $errors = phpbb_stop_error_collection(); + if ($this->db_connect_id) { if (version_compare($this->sql_server_info(true), '8.2', '>=')) @@ -102,7 +114,8 @@ class dbal_postgres extends dbal return $this->db_connect_id; } - return $this->sql_error(''); + $errors = phpbb_format_collected_errors($errors); + return $this->sql_error($errors); } /** diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 398a02380b..471d3476a0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3928,6 +3928,50 @@ function msg_handler($errno, $msg_text, $errfile, $errline) return false; } +function phpbb_error_collection_handler($errno, $msg_text, $errfile, $errline) +{ + global $phpbb_collected_errors; + $phpbb_collected_errors[-1][] = array($errno, $msg_text, $errfile, $errline); +} + +function phpbb_start_error_collection() +{ + global $phpbb_collected_errors; + if (!isset($phpbb_collected_errors)) + { + $phpbb_collected_errors = array(); + } + $phpbb_collected_errors[] = array(); + set_error_handler('phpbb_error_collection_handler'); +} + +function phpbb_stop_error_collection() +{ + global $phpbb_collected_errors; + restore_error_handler(); + $errors = array_pop($phpbb_collected_errors); + return $errors; +} + +function phpbb_format_collected_errors($errors) +{ + $text = ''; + foreach ($errors as $error) + { + if (!empty($text)) + { + $text .= "<br />\n"; + } + list($errno, $msg_text, $errfile, $errline) = $error; + $text .= "Errno $errno: $msg_text"; + if (defined('DEBUG')) + { + $text .= " at $errfile line $errline"; + } + } + return $text; +} + /** * Queries the session table to get information about online guests * @param int $item_id Limits the search to the item with this id |