diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in index 57708c62a..42de011fe 100644 --- a/scripts/zmpkg.pl.in +++ b/scripts/zmpkg.pl.in @@ -226,7 +226,12 @@ if ( $command =~ /^(?:start|restart)$/ ) zmMemTidy(); runCommand( "zmdc.pl startup" ); - Info( "Starting up services" . ( $Config{ZM_SERVER_ID} ? " for server $Config{ZM_SERVER_ID}\n" : "\n" ) ); + if ( $Config{ZM_SERVER_ID} ) { + Info( "Multi-server configuration detected. Starting up services for server $Config{ZM_SERVER_ID}\n"); + } else { + Info( "Single server configuration detected. Starting up services." ); + } + my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'SELECT * FROM Monitors'; my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() ); diff --git a/src/zm_config.cpp b/src/zm_config.cpp index 26051f113..4859e4bb8 100644 --- a/src/zm_config.cpp +++ b/src/zm_config.cpp @@ -135,11 +135,6 @@ void zmLoadConfig() } } - if ( ! staticConfig.SERVER_ID ) { - Debug( 1, "No Server ID or Name specified in config. Not using Multi-Server Mode." ); - } else { - Debug( 1, "Server is %d: using Multi-Server Mode.", staticConfig.SERVER_ID ); - } } StaticConfig staticConfig;