Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 778631: use a persistent Template::Provider to avoid recompiling templates between page loads on mod_perl

Browse Source 
r=dkl, a=LpSolit


git-svn-id: svn://10.0.0.236/trunk@264127 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org 2012-08-08 14:15:47 +00:00
parent ee79ce8feb
commit 2c83f44e36
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
8337 8338

14
mozilla/webtools/bugzilla/Bugzilla/Template.pm
View File

@ -40,6 +40,10 @@ use constant FORMAT_3_SIZE => [19,28,28];
use constant FORMAT_DOUBLE => '%19s %-55s'; use constant FORMAT_DOUBLE => '%19s %-55s';
use constant FORMAT_2_SIZE => [19,55]; use constant FORMAT_2_SIZE => [19,55];
# Use a per-process provider to cache compiled templates in memory across
# requests.
our %shared_providers;
# Pseudo-constant. # Pseudo-constant.
sub SAFE_URL_REGEXP { sub SAFE_URL_REGEXP {
my $safe_protocols = join('|', SAFE_PROTOCOLS); my $safe_protocols = join('|', SAFE_PROTOCOLS);
@ -603,6 +607,10 @@ sub create {
COMPILE_DIR => bz_locations()->{'template_cache'}, COMPILE_DIR => bz_locations()->{'template_cache'},
# Don't check for a template update until 1 hour has passed since the
# last check.
STAT_TTL => 60 * 60,
# Initialize templates (f.e. by loading plugins like Hook). # Initialize templates (f.e. by loading plugins like Hook).
PRE_PROCESS => ["global/variables.none.tmpl"], PRE_PROCESS => ["global/variables.none.tmpl"],
@ -973,6 +981,9 @@ sub create {
'default_authorizer' => new Bugzilla::Auth(), 'default_authorizer' => new Bugzilla::Auth(),
}, },
}; };
my $provider_key = join(':', @{ $config->{INCLUDE_PATH} });
$shared_providers{$provider_key} ||= Template::Provider->new($config);
$config->{LOAD_TEMPLATES} = [ $shared_providers{$provider_key} ];
local $Template::Config::CONTEXT = 'Bugzilla::Template::Context'; local $Template::Config::CONTEXT = 'Bugzilla::Template::Context';
@ -1037,6 +1048,9 @@ sub precompile_templates {
# effect of writing the compiled version to disk. # effect of writing the compiled version to disk.
$template->context->template($file); $template->context->template($file);
} }
# Clear out the cached Provider object
undef %shared_providers;
} }
# Under mod_perl, we look for templates using the absolute path of the # Under mod_perl, we look for templates using the absolute path of the