[open-ils-commits] [GIT] Evergreen ILS branch master updated. 0e33a2671133ea0bf268ff443ec3255f61b02640

[Evergreen Git]

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, master has been updated
       via  0e33a2671133ea0bf268ff443ec3255f61b02640 (commit)
      from  7a7c229db5044712ad44ad5a75ca7a65cd6d9105 (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 0e33a2671133ea0bf268ff443ec3255f61b02640
Author: Bill Erickson <berick at esilibrary.com>
Date:   Wed Jan 16 09:39:56 2013 -0500

    Avoid CStoreEditor failures on missing log-protect
    
    When the log_protect configuration chunk is not present in
    opensrf_core.xml, gracefully move on without it.  This prevents errors
    like:
    
    Can't call method \"shared\" on an undefined value at
    /usr/local/share/perl/5.10.1/OpenILS/Utils/CStoreEditor.pm line 646.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
index 23559e0..0a70648 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm
@@ -642,14 +642,18 @@ sub log_activity {
 	my $str = "$type.$action";
 
     if ($arg) {
-
-        my $redact = $OpenSRF::Application::shared_conf->shared->log_protect;
-        if (ref($redact) eq 'ARRAY' and grep { $method =~ /^$_/ } @{$redact}) {
-
-            # when API calls are marked as log-protect, avoid 
-            # dumping the param object to the activity log.
-            $str .= " **DETAILS REDACTED**";
-
+        
+        my $redact;
+
+        if ($OpenSRF::Application::shared_conf and
+            $OpenSRF::Application::shared_conf->shared and
+            $redact = $OpenSRF::Application::shared_conf->shared->log_protect and
+            ref($redact) eq 'ARRAY' and
+            grep { $method =~ /^$_/ } @{$redact}) {
+
+                # when API calls are marked as log-protect, avoid
+                # dumping the param object to the activity log.
+                $str .= " **DETAILS REDACTED**";
         } else {
 
             $str .= _prop_string($arg);

-----------------------------------------------------------------------

Summary of changes:
 .../src/perlmods/lib/OpenILS/Utils/CStoreEditor.pm |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Evergreen ILS