merging 5.5 bugfixes
This commit is contained in:
parent
9813752925
commit
2d28c61ec4
1 changed files with 2 additions and 5 deletions
|
|
@ -85,10 +85,8 @@ if (opendir (CONFDIR,$confdir)) {
|
||||||
my $startTime = time();
|
my $startTime = time();
|
||||||
WebGUI::Session::open($webguiRoot,$file);
|
WebGUI::Session::open($webguiRoot,$file);
|
||||||
WebGUI::Session::refreshUserInfo(3,$session{dbh});
|
WebGUI::Session::refreshUserInfo(3,$session{dbh});
|
||||||
my $previousTime = time();
|
|
||||||
my $currentTime;
|
|
||||||
foreach $namespace (keys %plugins) {
|
foreach $namespace (keys %plugins) {
|
||||||
$currentTime = time();
|
my $taskTime = time();
|
||||||
print "\t".$namespace if ($verbose);
|
print "\t".$namespace if ($verbose);
|
||||||
$exclude = $session{config}{excludeHourly};
|
$exclude = $session{config}{excludeHourly};
|
||||||
$exclude =~ s/ //g;
|
$exclude =~ s/ //g;
|
||||||
|
|
@ -96,8 +94,7 @@ if (opendir (CONFDIR,$confdir)) {
|
||||||
$cmd = $plugins{$namespace};
|
$cmd = $plugins{$namespace};
|
||||||
&$cmd($verbose);
|
&$cmd($verbose);
|
||||||
}
|
}
|
||||||
print " (".($currentTime-$previousTime)." seconds)\n" if ($verbose);
|
print " (".(time()-$taskTime)." seconds)\n" if ($verbose);
|
||||||
$previousTime = $currentTime;
|
|
||||||
}
|
}
|
||||||
WebGUI::Session::end($session{var}{sessionId});
|
WebGUI::Session::end($session{var}{sessionId});
|
||||||
WebGUI::Session::close();
|
WebGUI::Session::close();
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue