WebServices.java (eucalyptus-4.4.1) | : | WebServices.java (eucalyptus-4.4.2) | ||
---|---|---|---|---|
skipping to change at line 420 | skipping to change at line 420 | |||
} | } | |||
public static class WebServicePropertiesChangedEventListener implements EventL istener<Hertz> { | public static class WebServicePropertiesChangedEventListener implements EventL istener<Hertz> { | |||
// These are all the properties in StackConfiguration that have the RestartW ebServicesListener. | // These are all the properties in StackConfiguration that have the RestartW ebServicesListener. | |||
private Integer CHANNEL_CONNECT_TIMEOUT = 500; | private Integer CHANNEL_CONNECT_TIMEOUT = 500; | |||
private Boolean SERVER_CHANNEL_REUSE_ADDRESS = true; | private Boolean SERVER_CHANNEL_REUSE_ADDRESS = true; | |||
private Boolean SERVER_CHANNEL_NODELAY = true; | private Boolean SERVER_CHANNEL_NODELAY = true; | |||
private boolean CHANNEL_REUSE_ADDRESS = true; | private boolean CHANNEL_REUSE_ADDRESS = true; | |||
private Boolean CHANNEL_KEEP_ALIVE = true; | private Boolean CHANNEL_KEEP_ALIVE = true; | |||
private Boolean CHANNEL_NODELAY = true; | private Boolean CHANNEL_NODELAY = true; | |||
private Integer SERVER_POOL_MAX_THREADS = 128; | private Integer SERVER_POOL_MAX_THREADS = 32; | |||
private Long SERVER_POOL_MAX_MEM_PER_CONN = 0L; | private Long SERVER_POOL_MAX_MEM_PER_CONN = 0L; | |||
private Long SERVER_POOL_TOTAL_MEM = 0L; | private Long SERVER_POOL_TOTAL_MEM = 0L; | |||
private Long SERVER_POOL_TIMEOUT_MILLIS = 500L; | private Long SERVER_POOL_TIMEOUT_MILLIS = 500L; | |||
private Integer SERVER_BOSS_POOL_MAX_THREADS = 128; | private Integer SERVER_BOSS_POOL_MAX_THREADS = 128; | |||
private Long SERVER_BOSS_POOL_MAX_MEM_PER_CONN = 0L; | private Long SERVER_BOSS_POOL_MAX_MEM_PER_CONN = 0L; | |||
private Long SERVER_BOSS_POOL_TOTAL_MEM = 0L; | private Long SERVER_BOSS_POOL_TOTAL_MEM = 0L; | |||
private Long SERVER_BOSS_POOL_TIMEOUT_MILLIS = 500L; | private Long SERVER_BOSS_POOL_TIMEOUT_MILLIS = 500L; | |||
private Integer PORT = 8773; | private Integer PORT = 8773; | |||
private String LISTENER_ADDRESS_MATCH = ""; | private String LISTENER_ADDRESS_MATCH = "0.0.0.0"; | |||
private AtomicBoolean isRunning = new AtomicBoolean(false); | private AtomicBoolean isRunning = new AtomicBoolean(false); | |||
public static void register( ) { | public static void register( ) { | |||
Listeners.register(Hertz.class, new WebServicePropertiesChangedEventListen er()); | Listeners.register(Hertz.class, new WebServicePropertiesChangedEventListen er()); | |||
} | } | |||
@Override | @Override | |||
public void fireEvent( final Hertz event ) { | public void fireEvent( final Hertz event ) { | |||
if (Bootstrap.isOperational() && event.isAsserted( 60 ) && isRunning.compa reAndSet(false, true)) { | if (Bootstrap.isOperational() && event.isAsserted( 60 ) && isRunning.compa reAndSet(false, true)) { | |||
LOG.trace("Checking for updates to bootstrap.webservices properties"); | LOG.trace("Checking for updates to bootstrap.webservices properties"); | |||
skipping to change at line 457 | skipping to change at line 457 | |||
Boolean NEW_CHANNEL_NODELAY = StackConfiguration.CHANNEL_NODELAY; | Boolean NEW_CHANNEL_NODELAY = StackConfiguration.CHANNEL_NODELAY; | |||
Integer NEW_SERVER_POOL_MAX_THREADS = StackConfiguration.SERVER_POOL_MAX _THREADS; | Integer NEW_SERVER_POOL_MAX_THREADS = StackConfiguration.SERVER_POOL_MAX _THREADS; | |||
Long NEW_SERVER_POOL_MAX_MEM_PER_CONN = StackConfiguration.SERVER_POOL_M AX_MEM_PER_CONN; | Long NEW_SERVER_POOL_MAX_MEM_PER_CONN = StackConfiguration.SERVER_POOL_M AX_MEM_PER_CONN; | |||
Long NEW_SERVER_POOL_TOTAL_MEM = StackConfiguration.SERVER_POOL_TOTAL_ME M; | Long NEW_SERVER_POOL_TOTAL_MEM = StackConfiguration.SERVER_POOL_TOTAL_ME M; | |||
Long NEW_SERVER_POOL_TIMEOUT_MILLIS = StackConfiguration.SERVER_POOL_TIM EOUT_MILLIS; | Long NEW_SERVER_POOL_TIMEOUT_MILLIS = StackConfiguration.SERVER_POOL_TIM EOUT_MILLIS; | |||
Integer NEW_SERVER_BOSS_POOL_MAX_THREADS = StackConfiguration.SERVER_BOS S_POOL_MAX_THREADS; | Integer NEW_SERVER_BOSS_POOL_MAX_THREADS = StackConfiguration.SERVER_BOS S_POOL_MAX_THREADS; | |||
Long NEW_SERVER_BOSS_POOL_MAX_MEM_PER_CONN = StackConfiguration.SERVER_B OSS_POOL_MAX_MEM_PER_CONN; | Long NEW_SERVER_BOSS_POOL_MAX_MEM_PER_CONN = StackConfiguration.SERVER_B OSS_POOL_MAX_MEM_PER_CONN; | |||
Long NEW_SERVER_BOSS_POOL_TOTAL_MEM = StackConfiguration.SERVER_BOSS_POO L_TOTAL_MEM; | Long NEW_SERVER_BOSS_POOL_TOTAL_MEM = StackConfiguration.SERVER_BOSS_POO L_TOTAL_MEM; | |||
Long NEW_SERVER_BOSS_POOL_TIMEOUT_MILLIS = StackConfiguration.SERVER_BOS S_POOL_TIMEOUT_MILLIS; | Long NEW_SERVER_BOSS_POOL_TIMEOUT_MILLIS = StackConfiguration.SERVER_BOS S_POOL_TIMEOUT_MILLIS; | |||
Integer NEW_PORT = StackConfiguration.PORT; | Integer NEW_PORT = StackConfiguration.PORT; | |||
String NEW_LISTENER_ADDRESS_MATCH = Bootstrap.isOperational( ) ? StackCo nfiguration.LISTENER_ADDRESS_MATCH : ""; | String NEW_LISTENER_ADDRESS_MATCH = StackConfiguration.LISTENER_ADDRESS_ MATCH; | |||
if (!CHANNEL_CONNECT_TIMEOUT.equals(NEW_CHANNEL_CONNECT_TIMEOUT)) { | if (!CHANNEL_CONNECT_TIMEOUT.equals(NEW_CHANNEL_CONNECT_TIMEOUT)) { | |||
LOG.info("bootstrap.webservices.channel_connect_timeout has changed: o ldValue = " + CHANNEL_CONNECT_TIMEOUT + ", newValue = " + NEW_CHANNEL_CONNECT_TI MEOUT); | LOG.info("bootstrap.webservices.channel_connect_timeout has changed: o ldValue = " + CHANNEL_CONNECT_TIMEOUT + ", newValue = " + NEW_CHANNEL_CONNECT_TI MEOUT); | |||
CHANNEL_CONNECT_TIMEOUT = NEW_CHANNEL_CONNECT_TIMEOUT; | CHANNEL_CONNECT_TIMEOUT = NEW_CHANNEL_CONNECT_TIMEOUT; | |||
different = true; | different = true; | |||
} | } | |||
if (SERVER_CHANNEL_REUSE_ADDRESS != NEW_SERVER_CHANNEL_REUSE_ADDRESS) { | if (SERVER_CHANNEL_REUSE_ADDRESS != NEW_SERVER_CHANNEL_REUSE_ADDRESS) { | |||
LOG.info("bootstrap.webservices.server_channel_reuse_address has chang ed: oldValue = " + SERVER_CHANNEL_REUSE_ADDRESS + ", newValue = " + NEW_SERVER_C HANNEL_REUSE_ADDRESS); | LOG.info("bootstrap.webservices.server_channel_reuse_address has chang ed: oldValue = " + SERVER_CHANNEL_REUSE_ADDRESS + ", newValue = " + NEW_SERVER_C HANNEL_REUSE_ADDRESS); | |||
SERVER_CHANNEL_REUSE_ADDRESS = NEW_SERVER_CHANNEL_REUSE_ADDRESS; | SERVER_CHANNEL_REUSE_ADDRESS = NEW_SERVER_CHANNEL_REUSE_ADDRESS; | |||
different = true; | different = true; | |||
} | } | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added |