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

Bug 530270: Whining fails if mail queueing is enabled - Patch by Frédéric Buclin <LpSolit@gmail.com> r=mkanat a=LpSolit

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@259055 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
lpsolit%gmail.com 2009-11-22 22:26:04 +00:00
parent 6accceee13
commit 4d1c9584e4
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mozilla/webtools/bugzilla/Bugzilla.pm
View File

@ -386,12 +386,17 @@ sub job_queue {
sub dbh {
my $class = shift;
# If we're not connected, then we must want the main db
$class->request_cache->{dbh} ||= $class->request_cache->{dbh_main}
= Bugzilla::DB::connect_main();
$class->request_cache->{dbh} ||= $class->dbh_main;
return $class->request_cache->{dbh};
}
sub dbh_main {
my $class = shift;
$class->request_cache->{dbh_main} ||= Bugzilla::DB::connect_main();
return $class->request_cache->{dbh_main};
}
sub languages {
my $class = shift;
return $class->request_cache->{languages}
@ -487,7 +492,7 @@ sub switch_to_shadow_db {
if ($class->params->{'shadowdb'}) {
$class->request_cache->{dbh_shadow} = Bugzilla::DB::connect_shadow();
} else {
$class->request_cache->{dbh_shadow} = request_cache()->{dbh_main};
$class->request_cache->{dbh_shadow} = $class->dbh_main;
}
}
@ -501,11 +506,8 @@ sub switch_to_shadow_db {
sub switch_to_main_db {
my $class = shift;
$class->request_cache->{dbh} = $class->request_cache->{dbh_main};
# We have to return $class->dbh instead of {dbh} as
# {dbh_main} may be undefined if no connection to the main DB
# has been established yet.
return $class->dbh;
$class->request_cache->{dbh} = $class->dbh_main;
return $class->dbh_main;
}
sub get_fields {
@ -796,6 +798,10 @@ used to automatically answer or skip prompts.
The current database handle. See L<DBI>.
=item C<dbh_main>
The main database handle. See L<DBI>.
=item C<languages>
Currently installed languages.

4
mozilla/webtools/bugzilla/Bugzilla/JobQueue.pm
View File

@ -43,9 +43,11 @@ sub new {
}
my $lc = Bugzilla->localconfig;
# We need to use the main DB as TheSchwartz module is going
# to write to it.
my $self = $class->SUPER::new(
databases => [{
dsn => Bugzilla->dbh->{private_bz_dsn},
dsn => Bugzilla->dbh_main->{private_bz_dsn},
user => $lc->{db_user},
pass => $lc->{db_pass},
prefix => 'ts_',