rock.ru/legacy_rock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable pinba, enable newrelic

Browse Source
This commit is contained in:
Aleksei Miheev
2016-01-31 07:54:00 +00:00
parent 52db5f0d69
commit daee03e989
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forum/Sources/Subs.php
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;
}

19
forum/index.php
View File

@@ -134,6 +134,15 @@ call_user_func(smf_main());
// Call obExit specially; we're coming from the main area ;).
obExit(null, null, true);
function set_uri($uri) {
if (extension_loaded ('newrelic')) {
newrelic_name_transaction($uri);
}
#pinba_script_name_set($uri);
}
// The main controlling function.
function smf_main()
{
@@ -196,14 +205,14 @@ function smf_main()
if (empty($board) && empty($topic))
{
require_once($sourcedir . '/BoardIndex.php');
pinba_script_name_set("/forum/BoardIndex.php");
set_uri("/forum/BoardIndex.php");
return 'BoardIndex';
}
// Topic is empty, and action is empty.... MessageIndex!
elseif (empty($topic))
{
require_once($sourcedir . '/MessageIndex.php');
pinba_script_name_set("/forum/MessageIndex.php");
set_uri("/forum/MessageIndex.php");
return 'MessageIndex';
}
// Board is not empty... topic is not empty... action is empty.. Display!
@@ -211,7 +220,7 @@ function smf_main()
{
require_once($sourcedir . '/Subs-Post.php');
require_once($sourcedir . '/Display.php');
pinba_script_name_set("/forum/Display.php/board/${board}/topic/{$topic}");
set_uri("/forum/Display.php");
return 'Display';
}
}
@@ -355,13 +364,13 @@ function smf_main()
require_once($sourcedir . '/Themes.php');
return 'WrapAction';
}
set_uri("/forum/BoardIndex.php");
// Fall through to the board index then...
require_once($sourcedir . '/BoardIndex.php');
return 'BoardIndex';
}
pinba_script_name_set("/forum/{$actionArray[$_REQUEST['action']][0]}/{$actionArray[$_REQUEST['action']][1]}"); # . isset($_REQUEST['sa']) ? "/{$_REQUEST['sa']}/" : "");
set_uri("/forum/{$actionArray[$_REQUEST['action']][0]}/{$actionArray[$_REQUEST['action']][1]}"); # . isset($_REQUEST['sa']) ? "/{$_REQUEST['sa']}/" : "");
// Otherwise, it was set - so let's go to that action.
require_once($sourcedir . '/' . $actionArray[$_REQUEST['action']][0]);
return $actionArray[$_REQUEST['action']][1];