[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. f59b9fae493cc36c52007fd421e617ae721d171d
Evergreen Git
git at git.evergreen-ils.org
Wed Dec 12 13:23:33 EST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, rel_2_2 has been updated
via f59b9fae493cc36c52007fd421e617ae721d171d (commit)
from fbbe66947289e631aa510c28f343ff5b8891f43f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit f59b9fae493cc36c52007fd421e617ae721d171d
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Wed Apr 11 13:26:42 2012 -0400
mod_perl expects child_init return values
So add in Apache2::Const::OK returns on all of them.
[LFW: Added the same change to AutoSuggest.pm for consistency's sake.]
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
index 0e85a54..9c0611f 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AddedContent.pm
@@ -50,9 +50,9 @@ sub child_init {
my $sclient = OpenSRF::Utils::SettingsClient->new();
my $ac_data = $sclient->config_value("added_content");
- return unless $ac_data;
+ return Apache2::Const::OK unless $ac_data;
my $ac_handler = $ac_data->{module};
- return unless $ac_handler;
+ return Apache2::Const::OK unless $ac_handler;
$net_timeout = $ac_data->{timeout} || 1;
$error_countdown = $max_errors = $ac_data->{max_errors} || 10;
@@ -64,11 +64,12 @@ sub child_init {
if($@) {
$logger->error("Unable to load Added Content handler [$ac_handler]: $@");
- return;
+ return Apache2::Const::OK;
}
$handler = $ac_handler->new($ac_data);
$logger->debug("added content loaded handler: $handler");
+ return Apache2::Const::OK;
}
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm
index 220f1b2..c5d9ee1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm
@@ -35,6 +35,7 @@ sub initialize {
sub child_init {
$cache = OpenSRF::Utils::Cache->new('global');
$init_done = 1;
+ return Apache2::Const::OK;
}
# BEGIN package globals
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm
index 007623d..dbed38e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm
@@ -37,6 +37,7 @@ sub import {
sub child_init {
OpenSRF::System->bootstrap_client( config_file => $bootstrap );
+ return Apache2::Const::OK;
}
sub handler {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
index 502df6a..2fc4462 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm
@@ -47,6 +47,7 @@ sub import {
sub child_init {
OpenSRF::System->bootstrap_client( config_file => $bootstrap );
+ return Apache2::Const::OK;
}
sub handler {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm
index ee5b2ef..c55f137 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm
@@ -49,6 +49,7 @@ sub child_init {
};
$idl_doc = XML::LibXML->load_xml(location => $idl_file);
+ return Apache2::Const::OK;
}
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/PasswordReset.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/PasswordReset.pm
index 17ec305..60297e1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/PasswordReset.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/PasswordReset.pm
@@ -61,6 +61,7 @@ sub child_init {
$actor = OpenSRF::AppSession->create('open-ils.actor');
load_i18n();
$init_done = 1;
+ return Apache2::Const::OK;
}
sub password_reset {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm
index ee7b4ef..c6bc5f3 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm
@@ -55,6 +55,7 @@ sub import {
sub child_init {
OpenSRF::System->bootstrap_client( config_file => $bootstrap );
+ return Apache2::Const::OK;
}
sub handler {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm
index d6ca65e..24ed209 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm
@@ -27,6 +27,7 @@ sub import {
sub child_init {
OpenSRF::System->bootstrap_client( config_file => $bootstrap );
+ return Apache2::Const::OK;
}
sub handler {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm
index 573bcd4..0c1eca7 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm
@@ -49,7 +49,7 @@ sub child_init {
#$parser->expand_xinclude(1);
#$base_xml_doc = $parser->parse_file($base_xml);
-
+ return Apache2::Const::OK;
}
sub handler {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
index bc33b81..8fc95f1 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm
@@ -271,6 +271,7 @@ sub child_init {
}
}
}
+ return Apache2::Const::OK;
}
sub check_child_init() {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
index f72ac17..6eb3064 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/TemplateBatchBibUpdate.pm
@@ -48,6 +48,7 @@ sub import {
sub child_init {
OpenSRF::System->bootstrap_client( config_file => $bootstrap );
Fieldmapper->import(IDL => OpenSRF::Utils::SettingsClient->new->config_value("IDL"));
+ return Apache2::Const::OK;
}
sub handler {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm
index 0cdc41d..72e4f38 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm
@@ -49,6 +49,7 @@ sub import {
sub child_init {
OpenSRF::System->bootstrap_client( config_file => $bootstrap );
+ return Apache2::Const::OK;
}
sub spool_marc {
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm
index 26eb0a7..554c1af 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm
@@ -50,6 +50,7 @@ sub child_init {
OpenILS::Utils::Fieldmapper->require;
Fieldmapper->import(IDL => $idl);
OpenSRF::AppSession->ingress('apache');
+ return Apache2::Const::OK;
}
-----------------------------------------------------------------------
Summary of changes:
.../src/perlmods/lib/OpenILS/WWW/AddedContent.pm | 7 ++++---
.../src/perlmods/lib/OpenILS/WWW/AutoSuggest.pm | 1 +
Open-ILS/src/perlmods/lib/OpenILS/WWW/BadDebt.pm | 1 +
Open-ILS/src/perlmods/lib/OpenILS/WWW/Exporter.pm | 1 +
Open-ILS/src/perlmods/lib/OpenILS/WWW/IDL2js.pm | 1 +
.../src/perlmods/lib/OpenILS/WWW/PasswordReset.pm | 1 +
Open-ILS/src/perlmods/lib/OpenILS/WWW/Proxy.pm | 1 +
.../src/perlmods/lib/OpenILS/WWW/Proxy/Authen.pm | 1 +
Open-ILS/src/perlmods/lib/OpenILS/WWW/Reporter.pm | 2 +-
Open-ILS/src/perlmods/lib/OpenILS/WWW/SuperCat.pm | 1 +
.../lib/OpenILS/WWW/TemplateBatchBibUpdate.pm | 1 +
Open-ILS/src/perlmods/lib/OpenILS/WWW/Vandelay.pm | 1 +
.../src/perlmods/lib/OpenILS/WWW/XMLRPCGateway.pm | 1 +
13 files changed, 16 insertions(+), 4 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list