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

Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server

This commit is contained in:
Isaac Connor 2015-07-20 16:28:59 -04:00
parent dfd3d2c4cd 441a82e611
commit 9f1d91b655
2 changed files with 19 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/zm_config.cpp
View File

@ -115,7 +115,6 @@ void zmLoadConfig()
if ( ! staticConfig.SERVER_ID ) { if ( ! staticConfig.SERVER_ID ) {
if ( ! staticConfig.SERVER_NAME.empty() ) { if ( ! staticConfig.SERVER_NAME.empty() ) {
std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME.c_str() ); std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME.c_str() );
if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) { if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
staticConfig.SERVER_ID = atoi(dbrow[0]); staticConfig.SERVER_ID = atoi(dbrow[0]);
@ -126,30 +125,12 @@ void zmLoadConfig()
} // end if has SERVER_NAME } // end if has SERVER_NAME
} else if ( staticConfig.SERVER_NAME.empty() ) { } else if ( staticConfig.SERVER_NAME.empty() ) {
std::string sql = stringtf("SELECT Name FROM Servers WHERE Id='%d'", staticConfig.SERVER_ID ); std::string sql = stringtf("SELECT Name FROM Servers WHERE Id='%d'", staticConfig.SERVER_ID );
if ( mysql_query( &dbconn, sql.c_str() ) )
{
Error( "Can't run query: %s", mysql_error( &dbconn ) );
Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
}
MYSQL_RES *result = mysql_store_result( &dbconn ); if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
if ( !result )
{
Error( "Can't use query result: %s", mysql_error( &dbconn ) );
Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
}
int n_rows = mysql_num_rows( result );
if ( n_rows != 1 )
{
Error( "Bogus number of lines return from Server lookup, %d, returned. Can't reload", n_rows );
Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
}
if ( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
{
staticConfig.SERVER_NAME = std::string(dbrow[0]); staticConfig.SERVER_NAME = std::string(dbrow[0]);
} else {
Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
} }
mysql_free_result( result );
} }
} }

13
web/includes/config.php.in
View File

@ -167,12 +167,21 @@ function loadConfig( $defineConsts=true )
} }
// For Human-readability, user ZM_SERVER in zm.conf, and convert it here to a ZM_SERVER_ID // For Human-readability, user ZM_SERVER in zm.conf, and convert it here to a ZM_SERVER_ID
if ( ! defined(ZM_SERVER_ID) and defined(ZM_SERVER) ) { if ( ! defined('ZM_SERVER_ID') ) {
if ( defined('ZM_SERVER_NAME') ) {
$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME)); $server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_NAME));
if ( ! $server_id ) { if ( ! $server_id ) {
Error("ZM_SERVER_NAME set in config, but not found in Servers table."); Error("ZM_SERVER_NAME set in config, but not found in Servers table.");
} else { } else {
define( ZM_SERVER_ID, $server_id ); define( 'ZM_SERVER_ID', $server_id );
}
} else if ( defined('ZM_SERVER_HOST') ) {
$server_id = dbFetchOne('SELECT Id FROM Servers WHERE Name=?', 'Id', array(ZM_SERVER_HOST));
if ( ! $server_id ) {
Error("ZM_SERVER_HOST set in config, but not found in Servers table.");
} else {
define( 'ZM_SERVER_ID', $server_id );
}
} }
} }