Got an error: $msg
+The following fatal error has occurred:
+$msg| Apache | $versions{apacheVersion} |
|---|---|
| Koha | $versions{kohaVersion} |
| MySQL | $versions{mysqlVersion} |
| OS | $versions{osVersion} |
| Perl | $versions{perlVersion} |
| Apache | $versions{apacheVersion} |
| Koha | $versions{kohaVersion} |
| Koha DB | $versions{kohaDbVersion} |
| MySQL | $versions{mysqlVersion} |
| OS | $versions{osVersion} |
| Perl | $versions{perlVersion} |
Got an error: $msg
"; + print " +The following fatal error has occurred:
+$msgproduction mode - trapped fatal error
"; } - } - CGI::Carp->set_message(\&handle_errors); + print ""; + } + CGI::Carp::set_message(\&handle_errors); + ## give a stack backtrace if KOHA_BACKTRACES is set + ## can't rely on DebugLevel for this, as we're not yet connected + if ($ENV{KOHA_BACKTRACES}) { + $main::SIG{__DIE__} = \&CGI::Carp::confess; + } } # else there is no browser to send fatals to! $VERSION = '3.00.00.036'; } @@ -263,19 +281,19 @@ sub new { # check that the specified config file exists and is not empty undef $conf_fname unless - (defined $conf_fname && -e $conf_fname && -s $conf_fname); + (defined $conf_fname && -s $conf_fname); # Figure out a good config file to load if none was specified. if (!defined($conf_fname)) { # If the $KOHA_CONF environment variable is set, use # that. Otherwise, use the built-in default. - if (exists $ENV{"KOHA_CONF"} and $ENV{'KOHA_CONF'} and -e $ENV{"KOHA_CONF"} and -s $ENV{"KOHA_CONF"}) { + if (exists $ENV{"KOHA_CONF"} and $ENV{'KOHA_CONF'} and -s $ENV{"KOHA_CONF"}) { $conf_fname = $ENV{"KOHA_CONF"}; - } elsif ($INSTALLED_CONFIG_FNAME !~ /__KOHA_CONF_DIR/ and -e $INSTALLED_CONFIG_FNAME and -s $INSTALLED_CONFIG_FNAME) { + } elsif ($INSTALLED_CONFIG_FNAME !~ /__KOHA_CONF_DIR/ and -s $INSTALLED_CONFIG_FNAME) { # NOTE: be careful -- don't change __KOHA_CONF_DIR in the above # regex to anything else -- don't want installer to rewrite it $conf_fname = $INSTALLED_CONFIG_FNAME; - } elsif (-e CONFIG_FNAME and -s CONFIG_FNAME) { + } elsif (-s CONFIG_FNAME) { $conf_fname = CONFIG_FNAME; } else { warn "unable to locate Koha configuration file koha-conf.xml"; @@ -494,10 +512,18 @@ sub Zconn { my $auth=shift; my $piggyback=shift; my $syntax=shift; - if ( defined($context->{"Zconn"}->{$server}) ) { + if ( defined($context->{"Zconn"}->{$server}) && (0 == $context->{"Zconn"}->{$server}->errcode()) ) { return $context->{"Zconn"}->{$server}; # No connection object or it died. Create one. }else { + # release resources if we're closing a connection and making a new one + # FIXME: this needs to be smarter -- an error due to a malformed query or + # a missing index does not necessarily require us to close the connection + # and make a new one, particularly for a batch job. However, at + # first glance it does not look like there's a way to easily check + # the basic health of a ZOOM::Connection + $context->{"Zconn"}->{$server}->destroy() if defined($context->{"Zconn"}->{$server}); + $context->{"Zconn"}->{$server} = &_new_Zconn($server,$async,$auth,$piggyback,$syntax); return $context->{"Zconn"}->{$server}; } @@ -942,7 +968,8 @@ Gets various version info, for core Koha packages, Currently called from carp ha # A little example sub to show more debugging info for CGI::Carp sub get_versions { my %versions; - $versions{kohaVersion} = C4::Context->config("kohaversion"); + $versions{kohaVersion} = KOHAVERSION(); + $versions{kohaDbVersion} = C4::Context->preference('version'); $versions{osVersion} = `uname -a`; $versions{perlVersion} = $]; $versions{mysqlVersion} = `mysql -V`;