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

Revert "use temp config file for testing"

Browse source 
This reverts commit 9b725c6d42.
This commit is contained in:
Colin Kuskie 2010-06-14 15:19:54 -07:00
parent ce6f70ca94
commit 6c3369d0cb
22 changed files with 94 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/WebGUI/Config.pm
View file

@ -17,6 +17,7 @@ package WebGUI::Config;
use strict;
use Class::InsideOut qw(readonly id register);
use Cwd ();
use File::Spec;
use base 'Config::JSON';
my %config = ();
@ -169,8 +170,10 @@ sub new {
my $class = shift;
my $webguiPath = Cwd::realpath(shift);
my $filename = shift;
my $noCache = shift;
my $fullPath = Cwd::realpath($webguiPath.'/etc/'.$filename);
my $noCache = shift;
my $fullPath = File::Spec->file_name_is_absolute($filename)
? $filename
: Cwd::realpath($webguiPath.'/etc/'.$filename);
if ($config{$fullPath}) {
return $config{$fullPath};
} else {

2
lib/WebGUI/Workflow/Activity/DeleteExpiredSessions.pm
View file

@ -87,7 +87,7 @@ sub execute {
$self->session->errorHandler->warn("More than 1 old userLoginLog rows found, removing offending rows");
$self->session->db->write("delete from userLoginLog where lastPageViewed = timeStamp and sessionId = ? ", [$sessionId] );
}
my $session = WebGUI::Session->open($self->session->config->getWebguiRoot, $self->session->config->getFilename, undef, undef, $sessionId, 1);
my $session = WebGUI::Session->open($self->session->config->getWebguiRoot, $self->session->config->getFilePath, undef, undef, $sessionId, 1);
if (defined $session) {
$session->var->end;
$session->close;