Changeset 546 for trunk/lib/DB.inc.php

Timestamp:

Aug 27, 2015 2:35:55 AM (9 years ago)

Author:

anonymous

Message:

Detecting CLI also using php_sapi_name()

File:

• trunk/lib/DB.inc.php (modified) (3 diffs)

trunk/lib/DB.inc.php

@@ -227 +227 @@
     {
         if ($this->getParam('db_die_on_failure')) {
-            if (!defined('_CLI')) {
+            if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
                 // For http requests, send a Service Unavailable header.
                 header(' ', true, 503);
@@ -312 +312 @@
         // http://dev.mysql.com/doc/refman/5.0/en/gone-away.html
         if (!mysql_ping($this->dbh)) {
-            $app->logMsg(sprintf('MySQL ping failed; reconnecting
 ("%s")', truncate(trim($debugqry), 150)), LOG_NOTICE, __FILE__, __LINE__);
+            $app->logMsg(sprintf('MySQL ping failed; reconnecting
 ("%s")', truncate(trim($debugqry), 150)), LOG_DEBUG, __FILE__, __LINE__);
             $this->reconnect();
         }
@@ -323 +323 @@
             $app->logMsg(sprintf('MySQL error %s: %s in query: %s', mysql_errno($this->dbh), mysql_error($this->dbh), $debugqry), LOG_EMERG, __FILE__, __LINE__);
             if ($this->getParam('db_debug')) {
-                if (!defined('_CLI')) {
+                if (!defined('_CLI') && 'cli' !== php_sapi_name()) {
                     echo '<pre style="padding:2em; background:#ddd; font:9px monaco;">' . wordwrap(mysql_error($this->dbh)) . '<hr>' . htmlspecialchars($debugqry) . '</pre>';
                 }