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

change ErrorHandler to Log

Browse source
This commit is contained in:
Doug Bell 2010-10-27 12:50:12 -05:00
parent d11cd6f4f7
commit 199c4e4960
90 changed files with 311 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Operation/Auth.pm
View file

@ -47,7 +47,7 @@ sub getInstance {
#Create Auth Object
my $auth = eval { WebGUI::Pluggable::instanciate("WebGUI::Auth::".$authMethod, "new", [ $session, $authMethod, $userId ] ) };
if ($@) {
$session->errorHandler->fatal($@);
$session->log->fatal($@);
}
else {
return $auth;
@ -75,7 +75,7 @@ sub www_auth {
my $authMethod = getInstance($session,$auth);
my $methodCall = shift || $session->form->process("method") || "init";
if(!$authMethod->isCallable($methodCall)){
$session->errorHandler->security("access uncallable auth method: $methodCall");
$session->log->security("access uncallable auth method: $methodCall");
my $i18n = WebGUI::International->new($session);
return $i18n->get(1077);
}

8
lib/WebGUI/Operation/Cron.pm
View file

@ -272,7 +272,7 @@ sub www_runCronJob {
$session->http->setMimeType("text/plain");
$session->http->setCacheControl("none");
unless (Net::CIDR::Lite->new(@{ $session->config->get('spectreSubnets') })->find($session->request->address) || canView($session)) {
$session->errorHandler->security("make a Spectre cron job runner request, but we're only allowed to accept requests from ".join(",",@{$session->config->get("spectreSubnets")}).".");
$session->log->security("make a Spectre cron job runner request, but we're only allowed to accept requests from ".join(",",@{$session->config->get("spectreSubnets")}).".");
return "error";
}
my $taskId = $session->form->param("taskId");
@ -292,13 +292,13 @@ sub www_runCronJob {
});
if ( !$instance ) {
if ($session->stow->get('singletonWorkflowClash')) {
$session->errorHandler->warn(
$session->log->warn(
"Could not create workflow instance for workflowId '" . $task->get( "workflowId" )
. "' from taskId '".$taskId."': It is a singleton workflow and is still running from the last invocation."
);
return "done";
}
$session->errorHandler->error(
$session->log->error(
"Could not create workflow instance for workflowId '" . $task->get( "workflowId" )
. "' from taskId '".$taskId."': The result was undefined"
);
@ -313,7 +313,7 @@ sub www_runCronJob {
$task->delete( 1 ) if ( $task->get("runOnce") );
return "done";
}
$session->errorHandler->warn("No task ID passed to cron job runner.");
$session->log->warn("No task ID passed to cron job runner.");
return "error";
}

2
lib/WebGUI/Operation/FormHelpers.pm
View file

@ -48,7 +48,7 @@ sub www_formHelper {
return "ERROR" unless (defined $sub && defined $class);
my $output = eval { WebGUI::Pluggable::run($class, "www_".$sub, [$session]) };
if ($@) {
$session->errorHandler->error($@);
$session->log->error($@);
return "ERROR";
}
return $output;

4
lib/WebGUI/Operation/Help.pm
View file

@ -42,7 +42,7 @@ sub _loadHelp {
my $helpPackage = shift;
eval { WebGUI::Pluggable::load( $helpPackage ); };
if ($@) {
$session->errorHandler->error("Help failed to compile: $helpPackage. ".$@);
$session->log->error("Help failed to compile: $helpPackage. ".$@);
return {};
}
if (defined *{"$helpPackage\::HELP"}) { ##Symbol table lookup
@ -153,7 +153,7 @@ sub _get {
return $help->{$id};
}
else {
$session->errorHandler->warn("Unable to load help for $namespace -> $id");
$session->log->warn("Unable to load help for $namespace -> $id");
return undef;
}
}

2
lib/WebGUI/Operation/LDAPLink.pm
View file

@ -390,7 +390,7 @@ sub www_listLDAPLinks {
$ldapLink->unbind;
}
else {
$session->errorHandler->warn($ldapLink->getErrorMessage());
$session->log->warn($ldapLink->getErrorMessage());
$status .= ": ".$ldapLink->getErrorMessage();
}
$row[$i] .= '<td valign="top" class="tableData">'.$status.'</td>';

4
lib/WebGUI/Operation/Spectre.pm
View file

@ -60,7 +60,7 @@ sub www_spectreGetSiteData {
$subnets = [];
}
if (!Net::CIDR::Lite->new(@$subnets)->find($session->request->address)) {
$session->errorHandler->security("Tried to make a Spectre workflow data load request, but we're only allowed to accept requests from "
$session->log->security("Tried to make a Spectre workflow data load request, but we're only allowed to accept requests from "
.join(",",@{$subnets}).".");
}
else {
@ -183,7 +183,7 @@ sub www_spectreTest {
my $sessionIp = $session->request->address;
unless (Net::CIDR::Lite->new(@$subnets)->find($sessionIp)) {
$session->errorHandler->security(
$session->log->security(
sprintf "Tried to make a Spectre workflow runner request from %s, but we're only allowed to accept requests from %s",
$sessionIp, join(",",@{$subnets})
);

6
lib/WebGUI/Operation/Workflow.pm
View file

@ -82,7 +82,7 @@ sub www_activityHelper {
my $output = eval {WebGUI::Pluggable::instanciate($class, "www_".$sub, [$session])};
if ($@) {
$session->errorHandler->error($@);
$session->log->error($@);
return "ERROR";
}
return $output;
@ -483,7 +483,7 @@ sub www_runWorkflow {
$session->http->setMimeType("text/plain");
$session->http->setCacheControl("none");
unless (Net::CIDR::Lite->new(@{ $session->config->get('spectreSubnets')} )->find($session->request->address) || canRunWorkflow($session)) {
$session->errorHandler->security("make a Spectre workflow runner request, but we're only allowed to accept requests from ".join(",",@{$session->config->get("spectreSubnets")}).".");
$session->log->security("make a Spectre workflow runner request, but we're only allowed to accept requests from ".join(",",@{$session->config->get("spectreSubnets")}).".");
return "error";
}
my $instanceId = $session->form->param("instanceId");
@ -496,7 +496,7 @@ sub www_runWorkflow {
}
return "complete";
}
$session->errorHandler->warn("No instance ID passed to workflow runner.");
$session->log->warn("No instance ID passed to workflow runner.");
return "error";
}