Disable pinba, enable newrelic

This commit is contained in:
Aleksei Miheev
2016-01-31 07:54:00 +00:00
parent eee426dd69
commit 1259469303
2 changed files with 19 additions and 10 deletions

View File

@@ -216,10 +216,10 @@ if (!defined('SMF'))
function db_query($db_string, $file, $line)
{
global $db_cache, $db_count, $db_connection, $modSettings;
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,2);
$_file=str_replace('/var/www/rock/forum/','',$file);
$timer = pinba_timer_start(array("component" => 'db_query', 'function' => (isset ($trace[1]) ? $trace[1]['function'] : ''), 'location' => "{$_file}:{$line}"));
# $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS,2);
#
# $_file=str_replace('/var/www/rock/forum/','',$file);
# $timer = pinba_timer_start(array("component" => 'db_query', 'function' => (isset ($trace[1]) ? $trace[1]['function'] : ''), 'location' => "{$_file}:{$line}"));
// One more query....
$db_count = !isset($db_count) ? 1 : $db_count + 1;
@@ -300,7 +300,7 @@ function db_query($db_string, $file, $line)
$db_cache[$db_count]['t'] = $end[0] + $end[1] - $st[0] - $st[1];
}
pinba_timer_stop($timer);
# pinba_timer_stop($timer);
return $ret;
}