ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for db connection before assuming that dbh is valid

This commit is contained in:
Isaac Connor 2016-05-10 11:11:45 -04:00
parent aebfa5c237
commit aaa4b3a824
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/ZoneMinder/lib/ZoneMinder/Database.pm
View File

@ -78,8 +78,7 @@ sub zmDbConnect
{ {
zmDbDisconnect(); zmDbDisconnect();
} }
if ( !defined( $dbh ) ) if ( ( ! defined( $dbh ) ) or ! $dbh->ping() ) {
{
my ( $host, $port ) = ( $ZoneMinder::Config::Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ ); my ( $host, $port ) = ( $ZoneMinder::Config::Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
if ( defined($port) ) if ( defined($port) )