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

Jump to bottom

PAYARA-2670 JMX monitoring logging no longer logs when disabled #2708

Merged
merged 2 commits into from May 16, 2018
Merged

PAYARA-2670 JMX monitoring logging no longer logs when disabled #2708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26d06a2
PAYARA-2670 stop jmx-monitoring sevice sending notifications when not…
Cousjava May 4, 2018
d72084f
PAYARA-2670 JMX Logging no longer still logs when disabled
Cousjava May 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...es/jmx-monitoring-service/src/main/java/fish/payara/jmx/monitoring/MonitoringService.java
View file
Open in desktop
Expand Up @@ -153,7 +153,7 @@ public void event(Event event) {
* if enabled in the configuration.
*/
public void bootstrapMonitoringService() {
if (configuration != null) {
if (configuration != null && configuration.getEnabled().equalsIgnoreCase("true")) {
shutdownMonitoringService();//To make sure that there aren't multiple monitoring services running

executor = Executors.newScheduledThreadPool(1, new ThreadFactory() {
Expand Down
10 changes: 8 additions & 2 deletions ...-core/src/main/java/fish/payara/nucleus/notification/log/LogNotificationEventFactory.java
View file
Open in desktop
Expand Up @@ -41,7 +41,6 @@
import fish.payara.notification.healthcheck.HealthCheckResultEntry;
import fish.payara.notification.requesttracing.RequestTrace;
import fish.payara.nucleus.notification.configuration.NotifierType;
import fish.payara.nucleus.notification.domain.EventSource;
import fish.payara.nucleus.notification.domain.NotificationEventFactory;
import org.glassfish.api.StartupRunLevel;
import org.glassfish.hk2.runlevel.RunLevel;
Expand All @@ -52,6 +51,7 @@
import java.util.logging.Level;

/**
* Factory to build events for {@link LogNotifier}
* @author mertcaliskan
*/
@Service
Expand All @@ -63,7 +63,6 @@ void postConstruct() {
registerEventFactory(NotifierType.LOG, this);
}


@Override
protected LogNotificationEvent createEventInstance() {
return new LogNotificationEvent();
Expand All @@ -90,4 +89,11 @@ public LogNotificationEvent buildNotificationEvent(String name, List<HealthCheck

return notificationEvent;
}

@Override
public LogNotificationEvent buildNotificationEvent(Level level, String subject, String message, Object[] parameters) {
LogNotificationEvent event = super.buildNotificationEvent(level, subject, message, parameters);
event.setLevel(level);
return event;
}
}