oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove debug code from User.pm and fix slave handling in Session

Browse source
This commit is contained in:
Colin Kuskie 2007-03-08 22:54:20 +00:00
parent 62f3a9b045
commit 7d5e6ae526
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lib/WebGUI/Session.pm
View file

@ -182,6 +182,7 @@ Returns a random slave database handler, if one is defined, otherwise it returns
sub dbSlave {
my $self = shift;
return $self->db if $self->var->isAdminOn;
unless (exists $self->{_slave}) {
my @slaves = ();
foreach (1..3) {
@ -190,14 +191,17 @@ sub dbSlave {
push (@slaves, $slave);
}
}
my $slave = $slaves[rand @slaves];
$self->{_slave} = WebGUI::SQL->connect($self, $slave->{dsn},$slave->{user},$slave->{pass});
}
if ($self->var("adminOn") || !exists $self->{_slave}) {
return $self->db;
} else {
return $self->{_slave};
if (scalar @slaves > 0) {
my $slave = $slaves[rand @slaves];
$self->{_slave} = WebGUI::SQL->connect($self, $slave->{dsn},$slave->{user},$slave->{pass});
}
}
if (!exists $self->{_slave}) {
return $self->db;
}
else {
return $self->{_slave};
}
}

1
lib/WebGUI/User.pm
View file

@ -383,7 +383,6 @@ sub new {
my $cache = WebGUI::Cache->new($session,["user",$userId]);
my $userData = $cache->get;
unless ($userData->{_userId} && $userData->{_user}{username}) {
$session->errorHandler->warn('Cache invalid');
my %user;
tie %user, 'Tie::CPHash';
%user = $session->db->quickHash("select * from users where userId=?",[$userId]);