Enhance message array debug details

This commit is contained in:
FusionPBX 2025-01-22 20:07:02 -07:00 committed by GitHub
parent 8ea79e56e7
commit 7e4f82f840
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 61 additions and 43 deletions

View File

@ -545,7 +545,10 @@
$this->db->sqliteCreateFunction('strright', 'php_right', 2); $this->db->sqliteCreateFunction('strright', 'php_right', 2);
} }
else { else {
echo "not found"; $error_message = "file not found";
$message['message'] = $error_message;
$this->message = $message;
return false;
} }
} }
@ -606,7 +609,13 @@
$this->db = new PDO("odbc:".$this->db_name, $this->username, $this->password); $this->db = new PDO("odbc:".$this->db_name, $this->username, $this->password);
} }
catch (PDOException $e) { catch (PDOException $e) {
echo 'Connection failed: ' . $e->getMessage(); $message['message'] = $e->getMessage();
$message['code'] = $e->getCode();
$message['line'] = $e->getLine();
$message['file'] = $e->getFile();
$message['trace'] = $e->getTraceAsString();
$message['debug'] = debug_backtrace();
$this->message = $message;
} }
} }
} }
@ -730,12 +739,13 @@
//if unable to connect to the database //if unable to connect to the database
if (!$this->db) { if (!$this->db) {
$backtrace = debug_backtrace(); $message['message'] = $e->getMessage();
echo "Connection Failed<br />\n"; $message['code'] = $e->getCode();
echo "line number ".__line__."<br />\n"; $message['line'] = $e->getLine();
echo "<pre>"; $message['file'] = $e->getFile();
print_r($backtrace); $message['trace'] = $e->getTraceAsString();
echo "</pre>"; $message['debug'] = debug_backtrace();
$this->message = $message;
return false; return false;
} }
@ -973,13 +983,12 @@
} }
} }
catch(PDOException $e) { catch(PDOException $e) {
$message["type"] = 'error'; $message['message'] = $e->getMessage();
$message["code"] = $e->getCode(); $message['code'] = $e->getCode();
$message["message"] = $e->getMessage(); $message['line'] = $e->getLine();
$message["sql"] = $sql; $message['file'] = $e->getFile();
if (!empty($parameters)) { $message['trace'] = $e->getTraceAsString();
$message["parameters"] = $parameters; $message['debug'] = debug_backtrace();
}
$this->message = $message; $this->message = $message;
return false; return false;
} }
@ -1055,20 +1064,18 @@
//prepare the sql and parameters and then run the query //prepare the sql and parameters and then run the query
try { try {
//$this->sql = $sql;
//$this->db->exec($sql); //$this->db->exec($sql);
$prep_statement = $this->db->prepare($sql); $prep_statement = $this->db->prepare($sql);
$prep_statement->execute($params); $prep_statement->execute($params);
} }
catch(PDOException $e) { catch(PDOException $e) {
echo "<b>Error:</b><br />\n"; $message['message'] = $e->getMessage();
echo "<table>\n"; $message['code'] = $e->getCode();
echo "<tr>\n"; $message['line'] = $e->getLine();
echo "<td>\n"; $message['file'] = $e->getFile();
echo $e->getMessage(); $message['trace'] = $e->getTraceAsString();
echo "</td>\n"; $message['debug'] = debug_backtrace();
echo "</tr>\n"; $this->message = $message;
echo "</table>\n";
} }
unset($sql, $prep_statement, $this->fields); unset($sql, $prep_statement, $this->fields);
} }
@ -1369,8 +1376,7 @@
$this->message = $message; $this->message = $message;
$m++; $m++;
unset($sql); unset($sql, $statement);
unset($statement);
} }
catch(PDOException $e) { catch(PDOException $e) {
$retval = false; $retval = false;
@ -1570,8 +1576,10 @@
//unable to connect to the database //unable to connect to the database
if (!$this->db) { if (!$this->db) {
echo "Connection Failed<br />\n"; $error_message = "Connection Failed<br />\n";
echo "line number ".__line__."<br />\n"; $error_message .= "line number ".__line__."<br />\n";
$message['message'] = $error_message;
$this->message = $message;
return false; return false;
} }
@ -1615,14 +1623,12 @@
} }
} }
catch(PDOException $e) { catch(PDOException $e) {
$message["message"] = "Bad Request"; $message['message'] = $e->getMessage();
$message["code"] = "400"; $message['code'] = $e->getCode();
$message["error"]["message"] = $e->getMessage(); $message['line'] = $e->getLine();
$message["sql"] = $sql; $message['file'] = $e->getFile();
$message['trace'] = $e->getTraceAsString();
if (is_array($parameters)) { $message['debug'] = debug_backtrace();
$message["parameters"] = $parameters;
}
$this->message = $message; $this->message = $message;
return false; return false;
} }
@ -2197,9 +2203,11 @@
$result = $prep_statement->fetchAll(PDO::FETCH_ASSOC); $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC);
} }
catch(PDOException $e) { catch(PDOException $e) {
echo $sql."<br />\n"; $message["type"] = 'error';
echo 'Caught exception: '. $e->getMessage()."<br /><br />\n"; $message["code"] = $e->getCode();
echo $sql. "<br /><br />\n"; $message["message"] = $e->getMessage();
$message["sql"] = $sql;
$this->message = $message;
return false; return false;
} }
@ -2523,9 +2531,13 @@
unset($prep_statement); unset($prep_statement);
} }
catch(PDOException $e) { catch(PDOException $e) {
echo $sql."<br />\n"; $message['message'] = $e->getMessage();
echo 'Caught exception: '. $e->getMessage()."<br /><br />\n"; $message['code'] = $e->getCode();
echo $sql. "<br /><br />\n"; $message['line'] = $e->getLine();
$message['file'] = $e->getFile();
$message['trace'] = $e->getTraceAsString();
$message['debug'] = debug_backtrace();
$this->message = $message;
return false; return false;
} }
@ -2907,7 +2919,13 @@
unset($sql); unset($sql);
} }
catch(PDOException $e) { catch(PDOException $e) {
echo $e->getMessage(); $message['message'] = $e->getMessage();
$message['code'] = $e->getCode();
$message['line'] = $e->getLine();
$message['file'] = $e->getFile();
$message['trace'] = $e->getTraceAsString();
$message['debug'] = debug_backtrace();
$this->message = $message;
return false; return false;
} }
} }