add hostname in error messages (task for DAILY-36678)

dailymotion · Jan 26, 2015 · 3312433 · 3312433
1 parent b1021c6
commit 3312433
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/MyDBD.php b/MyDBD.php
@@ -319,7 +319,7 @@ protected function handleErrors($query = null)
     {
         if ($this->link->errno)
         {
-            MyDBD_Error::throwError($this->link->errno, $this->link->error . ' /* ' . $this->dbName() . ' */', $this->link->sqlstate, $query);
+            MyDBD_Error::throwError($this->connectionInfo['hostname'], $this->link->errno, $this->link->error . ' /* ' . $this->dbName() . ' */', $this->link->sqlstate, $query);
         }
     }
 
@@ -442,7 +442,7 @@ public function prepare()
         $this->lastQueryHandle = $stmt; // used by affectedRows()
         $this->handleErrors();
 
-        $sth = new MyDBD_PreparedStatement($stmt, $this->options);
+        $sth = new MyDBD_PreparedStatement($stmt, $this->options, $this->connectionInfo);
         try
         {
             $sth->prepare($query, $args);

diff --git a/MyDBD/Error.php b/MyDBD/Error.php
@@ -49,8 +49,10 @@ abstract class MyDBD_Error
             2030 => 'SQLNotPreparedStatementException',
         );
 
-    static public function throwError($errorno, $error, $sqlstate = null, $query = null, array $params = null)
+    static public function throwError($hostname, $errorno, $error, $sqlstate = null, $query = null, array $params = null)
     {
+        $error .= ' on hostname: ' . $hostname;
+
         if (isset($query))
         {
             $error .= ' for query: ' . $query;

diff --git a/MyDBD/PreparedStatement.php b/MyDBD/PreparedStatement.php
@@ -13,6 +13,7 @@ class MyDBD_PreparedStatement
     private
         $stmt           = null,
         $options        = null,
+        $connectionInfo = null,
         $frozen         = false,
         $preparedQuery  = null,
         $resultSet      = null,
@@ -23,10 +24,11 @@ class MyDBD_PreparedStatement
      *
      * @param mysqli_stmt $preparedStatement
      */
-    public function __construct(mysqli_stmt $preparedStatement, array $options)
+    public function __construct(mysqli_stmt $preparedStatement, array $options, array $connectionInfo)
     {
-        $this->stmt    = $preparedStatement;
-        $this->options = $options;
+        $this->stmt           = $preparedStatement;
+        $this->options        = $options;
+        $this->connectionInfo = $connectionInfo;
     }
 
     /**
@@ -323,7 +325,7 @@ protected function handleErrors($query = null, $params = null)
     {
         if ($this->stmt->errno)
         {
-            MyDBD_Error::throwError($this->stmt->errno, $this->stmt->error, null, $query, $params);
+            MyDBD_Error::throwError($this->connectionInfo['hostname'], $this->stmt->errno, $this->stmt->error, null, $query, $params);
         }
     }
 }