Fixes for db/cache counter

[mailer.git] / inc / db / lib-mysql3.php

diff --git a/inc/db/lib-mysql3.php b/inc/db/lib-mysql3.php
index 14fa713b84649b96421e2456fbdb454ca93f49d3..182b88895a08b7bd9bfe3253bc6fd6a80beb2ae7 100644 (file)
--- a/inc/db/lib-mysql3.php
+++ b/inc/db/lib-mysql3.php
@@ -85,12 +85,12 @@ function SQL_QUERY($sql_string, $F, $L) {
        } // END - if
 
        // Count DB hits
-       if (!isset($_CONFIG['db_hits'])) {
+       if (!isset($_CONFIG['db_hits_run'])) {
                // Count in dummy variable
-               $_CONFIG['db_hits'] = 1;
+               $_CONFIG['db_hits_run'] = 1;
        } else {
                // Count to config array
-               $_CONFIG['db_hits']++;
+               $_CONFIG['db_hits_run']++;
        }
 
        // Return the result
@@ -179,13 +179,17 @@ function SQL_SELECT_DB($dbName, $link, $F, $L) {
 }
 // SQL close link
 function SQL_CLOSE(&$link, $F, $L) {
+       global $_CONFIG, $cacheInstance, $cacheArray;
+
        // Is there still a valid link?
        if (!is_resource($link)) {
                // Skip double close
                return false;
        } // END - if
 
-       global $_CONFIG, $cacheInstance, $cacheArray;
+       // Add new hits
+       $_CONFIG['db_hits'] += $_CONFIG['db_hits_run'];
+       //* DEBUG: */ echo "DB=".$_CONFIG['db_hits'].",CACHE=".$_CONFIG['cache_hits']."<br />\n";
        if ((GET_EXT_VERSION("cache") >= "0.0.7") && (isset($_CONFIG['db_hits'])) && (isset($_CONFIG['cache_hits'])) && (is_object($cacheInstance))) {
                // Update counter for db/cache
                UPDATE_CONFIG(array("db_hits", "cache_hits"), array(bigintval($_CONFIG['db_hits']), bigintval($_CONFIG['cache_hits'])));