Skip to content

Commit

Permalink
Unify hazelcast configuration among cores and edges
Browse files Browse the repository at this point in the history
  • Loading branch information
davidegrohmann committed Sep 6, 2016
1 parent cf29e76 commit dd11deb
Showing 1 changed file with 5 additions and 8 deletions.
Expand Up @@ -32,8 +32,7 @@ public class HazelcastDiscoveryServiceFactory implements DiscoveryServiceFactory
public CoreTopologyService coreTopologyService( Config config, MemberId myself, LogProvider logProvider, public CoreTopologyService coreTopologyService( Config config, MemberId myself, LogProvider logProvider,
LogProvider userLogProvider ) LogProvider userLogProvider )
{ {
makeHazelcastSilent( config ); configureHazelcast( config );
hazelcastShouldNotPhoneHome();
return new HazelcastCoreTopologyService( config, myself, logProvider, userLogProvider ); return new HazelcastCoreTopologyService( config, myself, logProvider, userLogProvider );
} }


Expand All @@ -42,19 +41,17 @@ public TopologyService edgeDiscoveryService( Config config, AdvertisedSocketAddr
LogProvider logProvider, DelayedRenewableTimeoutService timeoutService, LogProvider logProvider, DelayedRenewableTimeoutService timeoutService,
long edgeTimeToLiveTimeout, long edgeRefreshRate ) long edgeTimeToLiveTimeout, long edgeRefreshRate )
{ {
makeHazelcastSilent( config ); configureHazelcast( config );
return new HazelcastClient( new HazelcastClientConnector( config ), logProvider, boltAddress, timeoutService, return new HazelcastClient( new HazelcastClientConnector( config ), logProvider, boltAddress, timeoutService,
edgeTimeToLiveTimeout, edgeRefreshRate ); edgeTimeToLiveTimeout, edgeRefreshRate );
} }


private void hazelcastShouldNotPhoneHome() private static void configureHazelcast( Config config )
{ {
// tell hazelcast to not phone home
System.setProperty( "hazelcast.phone.home.enabled", "false" ); System.setProperty( "hazelcast.phone.home.enabled", "false" );
}


private static void makeHazelcastSilent( Config config ) // Make hazelcast quiet
{
// Make hazelcast quiet for core and edge servers
if ( config.get( CoreEdgeClusterSettings.disable_middleware_logging ) ) if ( config.get( CoreEdgeClusterSettings.disable_middleware_logging ) )
{ {
// This is clunky, but the documented programmatic way doesn't seem to work // This is clunky, but the documented programmatic way doesn't seem to work
Expand Down

0 comments on commit dd11deb

Please sign in to comment.