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

Merge branch 'merge_db_connects' into storageareas

This commit is contained in:
Isaac Connor 2016-05-07 09:35:14 -04:00
parent 1d63062188 b444c8a6b4
commit e064af4214
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/ZoneMinder/lib/ZoneMinder.pm
View File

@ -81,12 +81,6 @@ our @EXPORT = ( @EXPORT_OK );
our $VERSION = $ZoneMinder::Base::VERSION; our $VERSION = $ZoneMinder::Base::VERSION;
BEGIN {
require ZoneMinder::Config;
require ZoneMinder::Database;
ZoneMinder::Config::zmConfigLoad();
ZoneMinder::Database::zmDbConnect();
}
1; 1;
__END__ __END__

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

@ -31,6 +31,7 @@ use DBI;
require Exporter; require Exporter;
require ZoneMinder::Base; require ZoneMinder::Base;
require ZoneMinder::Config;
our @ISA = qw(Exporter ZoneMinder::Base); our @ISA = qw(Exporter ZoneMinder::Base);
@ -65,7 +66,6 @@ our $VERSION = $ZoneMinder::Base::VERSION;
# ========================================================================== # ==========================================================================
use ZoneMinder::Logger qw(:all); use ZoneMinder::Logger qw(:all);
use ZoneMinder::Config qw(:all);
use Carp; use Carp;
@ -80,23 +80,23 @@ sub zmDbConnect
} }
if ( !defined( $dbh ) ) if ( !defined( $dbh ) )
{ {
my ( $host, $port ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ ); my ( $host, $port ) = ( $ZoneMinder::Config::Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
if ( defined($port) ) if ( defined($port) )
{ {
$dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME} $dbh = DBI->connect( "DBI:mysql:database=".$ZoneMinder::Config::Config{ZM_DB_NAME}
.";host=".$host .";host=".$host
.";port=".$port .";port=".$port
, $Config{ZM_DB_USER} , $ZoneMinder::Config::Config{ZM_DB_USER}
, $Config{ZM_DB_PASS} , $ZoneMinder::Config::Config{ZM_DB_PASS}
); );
} }
else else
{ {
$dbh = DBI->connect( "DBI:mysql:database=".$Config{ZM_DB_NAME} $dbh = DBI->connect( "DBI:mysql:database=".$ZoneMinder::Config::Config{ZM_DB_NAME}
.";host=".$Config{ZM_DB_HOST} .";host=".$ZoneMinder::Config::Config{ZM_DB_HOST}
, $Config{ZM_DB_USER} , $ZoneMinder::Config::Config{ZM_DB_USER}
, $Config{ZM_DB_PASS} , $ZoneMinder::Config::Config{ZM_DB_PASS}
); );
} }
$dbh->trace( 0 ); $dbh->trace( 0 );