Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PAYARA-1543 admin console shows restart required when a thread pool i… #1498

Merged
merged 2 commits into from
Apr 5, 2017
Merged

PAYARA-1543 admin console shows restart required when a thread pool i… #1498

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17fb34b
PAYARA-1543 admin console shows restart required when a thread pool i…
Cousjava Mar 29, 2017
2c938b7
Merge branch 'master' of git://github.com/Payara/payara into PAYARA-1…
Cousjava Apr 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions .../core/kernel/src/main/java/com/sun/enterprise/v3/services/impl/DynamicConfigListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import org.glassfish.grizzly.config.dom.ThreadPool;
import org.glassfish.grizzly.config.dom.Transport;
import com.sun.enterprise.config.serverbeans.Config;
import com.sun.enterprise.config.serverbeans.MonitoringService;
import com.sun.enterprise.config.serverbeans.SystemProperty;

import org.jvnet.hk2.config.Changed;
Expand Down Expand Up @@ -84,6 +85,7 @@
public class DynamicConfigListener implements ConfigListener {

private static final String ADMIN_LISTENER = "admin-listener";
private static final String OFF = "OFF";
private GrizzlyService grizzlyService;
private Config config;
private final Logger logger;
Expand Down Expand Up @@ -128,8 +130,13 @@ public <T extends ConfigBeanProxy> NotProcessed changed(TYPE type,
} else if (tClass == ThreadPool.class && t instanceof ThreadPool) {
NotProcessed notProcessed = null;
for (NetworkListener listener : ((ThreadPool) t).findNetworkListeners()) {
// for each network listener which listens to this thread, update itself. Return any unprocessed events.
notProcessed = processNetworkListener(type, listener, events);
notProcessed = processNetworkListener(type, listener, null);
}

MonitoringService ms = config.getMonitoringService();
String level = ms.getModuleMonitoringLevels().getThreadPool();
if (level != null && (!level.equals(OFF)) && notProcessed == null){
notProcessed = new NotProcessed("Monitoring not set with new admin pool");
}
return notProcessed;
} else if (tClass == Transport.class && t instanceof Transport) {
Expand All @@ -144,14 +151,14 @@ public <T extends ConfigBeanProxy> NotProcessed changed(TYPE type,
return processVirtualServer(type, (VirtualServer) t);
} else if (tClass == SystemProperty.class && t instanceof SystemProperty) {
NetworkConfig networkConfig = config.getNetworkConfig();
if ((networkConfig != null) && ((SystemProperty) t).getName().endsWith("LISTENER_PORT")) {
if ((networkConfig != null) && ((SystemProperty)t).getName().endsWith("LISTENER_PORT")) {
for (NetworkListener listener : networkConfig.getNetworkListeners().getNetworkListener()) {
if (listener.getPort().equals(((SystemProperty) t).getValue())) {
return processNetworkListener(Changed.TYPE.CHANGE, listener, events);
if (listener.getPort().equals(((SystemProperty)t).getValue())) {
return processNetworkListener(Changed.TYPE.CHANGE, listener, events);
}
}
}
}
return null;
return null;
}
return null;
}
Expand Down