[Rt-commit] rt branch, 3.8-trunk, updated. rt-3.8.8-124-g1b7781c

[? sunnavy]

The branch, 3.8-trunk has been updated
       via  1b7781c70a5b8d9f3eecd2752cfd6baa0f62fa7d (commit)
      from  24424172b1e276d291297abf8343eddd18480266 (commit)

Summary of changes:
 lib/RT/Util.pm |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 1b7781c70a5b8d9f3eecd2752cfd6baa0f62fa7d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Aug 4 08:05:51 2010 +0800

    make error msg to end users a bit friendlier

diff --git a/lib/RT/Util.pm b/lib/RT/Util.pm
index 704a74c..3f48cf4 100644
--- a/lib/RT/Util.pm
+++ b/lib/RT/Util.pm
@@ -80,12 +80,15 @@ sub safe_run_child (&) {
         }
         1;
     } or do {
+        my $err = $@;
         if ( $our_pid == $$ ) {
-            $RT::Logger->error( $@ );
+            $RT::Logger->error( $err );
             $dbh->{'InactiveDestroy'} = 0 if $dbh;
             $RT::Handle->{'DisconnectHandleOnDestroy'} = 1;
         }
-        die $@;
+        $err = "Error just happened, please contact administrator:\n" . $err;
+        $err =~ s/^Stack:.*$//ms;
+        die $err;
     };
     return $want? (@res) : $res[0];
 }

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