Skip to content

Commit

Permalink
Revert "Merge pull request payara#5305 from rdebusscher/FISH-1509"
Browse files Browse the repository at this point in the history 
This reverts commit a44c233.
  • Loading branch information
@JamesHillyard
JamesHillyard committed Dec 22, 2021
1 parent 5f36552 commit 151e05d
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 372 deletions.
3 changes: 1 addition & 2 deletions .../payara-micro/payara-micro-core/src/main/java/fish/payara/micro/impl/PayaraMicroImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@
import java.util.logging.Logger;

import com.sun.appserv.server.util.Version;
import com.sun.common.util.logging.SortedLoggingProperties;
import com.sun.enterprise.glassfish.bootstrap.Constants;
import com.sun.enterprise.glassfish.bootstrap.GlassFishImpl;
import com.sun.enterprise.server.logging.ODLLogFormatter;
Expand Down Expand Up @@ -1791,7 +1790,7 @@ private void resetLogging(String loggingProperty) {

// now write them back
try (OutputStream os = new FileOutputStream(runtimeDir.getLoggingProperties())) {
new SortedLoggingProperties(currentProps).store(os, "Generated Logging properties file from Payara Micro log to file option");
currentProps.store(os, "Generated Logging properties file from Payara Micro log to file option");
} catch (IOException ex) {
LOGGER.log(Level.SEVERE, "Unable to load the logging properties from the runtime directory", ex);
}
Expand Down
113 changes: 42 additions & 71 deletions nucleus/admin/template/src/main/resources/config/logging.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,101 +37,72 @@
# only if the new code is made subject to such option by the copyright
# holder.
#
# Portions Copyright [2016-2021] [Payara Foundation and/or its affiliates]
# Portions Copyright [2016-2019] [Payara Foundation and/or its affiliates]

#GlassFish logging.properties list
#Update June 13 2012

#Update Thurs Oct 18 2012
#All attributes details
handlers=java.util.logging.ConsoleHandler
handlerServices=com.sun.enterprise.server.logging.GFFileHandler,com.sun.enterprise.server.logging.SyslogHandler
java.util.logging.ConsoleHandler.formatter=com.sun.enterprise.server.logging.UniformLogFormatter
java.util.logging.FileHandler.count=1
java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
java.util.logging.FileHandler.limit=50000
java.util.logging.FileHandler.pattern=%h/java%u.log
com.sun.enterprise.server.logging.GFFileHandler.compressOnRotation=false
com.sun.enterprise.server.logging.GFFileHandler.excludeFields=
com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.ODLLogFormatter
com.sun.enterprise.server.logging.GFFileHandler.file=${com.sun.aas.instanceRoot}/logs/server.log
com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
com.sun.enterprise.server.logging.GFFileHandler.flushFrequency=1
com.sun.enterprise.server.logging.GFFileHandler.formatter=com.sun.enterprise.server.logging.ODLLogFormatter
com.sun.enterprise.server.logging.GFFileHandler.level=ALL
com.sun.enterprise.server.logging.GFFileHandler.logStandardStreams=true
com.sun.enterprise.server.logging.GFFileHandler.logtoConsole=false
java.util.logging.FileHandler.limit=50000
com.sun.enterprise.server.logging.GFFileHandler.logtoFile=true
com.sun.enterprise.server.logging.GFFileHandler.maxHistoryFiles=0
com.sun.enterprise.server.logging.GFFileHandler.multiLineMode=true
com.sun.enterprise.server.logging.GFFileHandler.retainErrorsStasticsForHours=0
com.sun.enterprise.server.logging.GFFileHandler.logtoConsole=false
com.sun.enterprise.server.logging.GFFileHandler.rotationLimitInBytes=2000000
com.sun.enterprise.server.logging.GFFileHandler.rotationOnDateChange=false
com.sun.enterprise.server.logging.GFFileHandler.rotationTimelimitInMinutes=0
com.sun.enterprise.server.logging.SyslogHandler.level=ALL
com.sun.enterprise.server.logging.GFFileHandler.excludeFields=
com.sun.enterprise.server.logging.GFFileHandler.multiLineMode=true
com.sun.enterprise.server.logging.SyslogHandler.useSystemLogging=false
java.util.logging.FileHandler.count=1
com.sun.enterprise.server.logging.GFFileHandler.retainErrorsStasticsForHours=0
log4j.logger.org.hibernate.validator.util.Version=warn
com.sun.enterprise.server.logging.GFFileHandler.maxHistoryFiles=0
com.sun.enterprise.server.logging.GFFileHandler.rotationOnDateChange=false
java.util.logging.FileHandler.pattern=%h/java%u.log
java.util.logging.FileHandler.formatter=java.util.logging.XMLFormatter
com.sun.enterprise.server.logging.GFFileHandler.compressOnRotation=false
com.sun.enterprise.server.logging.GFFileHandler.logStandardStreams=true
com.sun.enterprise.server.logging.UniformLogFormatter.ansiColor=true

#Payara Notification logging properties
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.compressOnRotation=false
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.file=${com.sun.aas.instanceRoot}/logs/notification.log
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.formatter=com.sun.enterprise.server.logging.ODLLogFormatter
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.logtoFile=true
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.maxHistoryFiles=0
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.rotationLimitInBytes=2000000
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.rotationOnDateChange=false
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.rotationTimelimitInMinutes=0
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.rotationLimitInBytes=2000000
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.maxHistoryFiles=0
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.file=${com.sun.aas.instanceRoot}/logs/notification.log
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.compressOnRotation=false
fish.payara.enterprise.server.logging.PayaraNotificationFileHandler.formatter=com.sun.enterprise.server.logging.ODLLogFormatter

fish.payara.deprecated.jsonlogformatter.underscoreprefix=false

#All log level details

.level=INFO
ShoalLogger.level=CONFIG
com.hazelcast.level=WARNING
com.sun.enterprise.server.logging.GFFileHandler.level=ALL
com.sun.enterprise.server.logging.SyslogHandler.level=ALL
javax.enterprise.system.tools.admin.level=INFO
org.apache.jasper.level=INFO
javax.enterprise.system.core.level=INFO
javax.enterprise.system.core.classloading.level=INFO
java.util.logging.ConsoleHandler.level=FINEST
javax.enterprise.resource.corba.level=INFO
javax.enterprise.resource.javamail.level=INFO
javax.enterprise.resource.jdo.level=INFO
javax.enterprise.resource.jms.level=INFO
javax.enterprise.resource.jta.level=INFO
javax.enterprise.system.tools.deployment.level=INFO
javax.enterprise.system.core.transaction.level=INFO
org.apache.catalina.level=INFO
org.apache.coyote.level=INFO
javax.level=INFO
javax.enterprise.system.util.level=INFO
javax.enterprise.resource.resourceadapter.level=INFO
javax.enterprise.resource.sqltrace.level=FINE
javax.enterprise.resource.webcontainer.jsf.application.level=INFO
javax.enterprise.resource.webcontainer.jsf.config.level=INFO
javax.enterprise.resource.webcontainer.jsf.context.level=INFO
javax.enterprise.resource.webcontainer.jsf.facelets.level=INFO
javax.enterprise.resource.webcontainer.jsf.lifecycle.level=INFO
javax.enterprise.resource.webcontainer.jsf.managedbean.level=INFO
javax.enterprise.resource.webcontainer.jsf.renderkit.level=INFO
javax.enterprise.resource.webcontainer.jsf.resource.level=INFO
javax.enterprise.resource.webcontainer.jsf.taglib.level=INFO
javax.enterprise.resource.webcontainer.jsf.timing.level=INFO
javax.enterprise.system.container.cmp.level=INFO
javax.enterprise.system.container.ejb.level=INFO
javax.enterprise.system.container.ejb.mdb.level=INFO
javax.enterprise.system.container.web.level=INFO
javax.enterprise.system.core.classloading.level=INFO
javax.enterprise.system.core.config.level=INFO
javax.enterprise.system.core.level=INFO
javax.enterprise.system.level=INFO
javax.enterprise.system.core.security.level=INFO
javax.enterprise.system.container.cmp.level=INFO
javax.enterprise.system.core.selfmanagement.level=INFO
javax.enterprise.system.core.transaction.level=INFO
javax.enterprise.system.level=INFO
javax.enterprise.system.ssl.security.level=INFO
javax.enterprise.system.tools.admin.level=INFO
javax.enterprise.system.tools.backup.level=INFO
javax.enterprise.system.tools.deployment.common.level=WARNING
javax.enterprise.system.tools.deployment.dol.level=WARNING
javax.enterprise.system.tools.deployment.level=INFO
javax.enterprise.system.util.level=INFO
javax.enterprise.system.webservices.registry.level=INFO
javax.enterprise.system.webservices.rpc.level=INFO
javax.enterprise.system.webservices.saaj.level=INFO
javax.level=INFO
javax.mail.level=INFO
javax.org.glassfish.persistence.level=INFO
org.apache.catalina.level=INFO
org.apache.coyote.level=INFO
org.apache.jasper.level=INFO
org.eclipse.persistence.session.level=INFO
org.glassfish.admingui.level=INFO
org.glassfish.naming.level=INFO
.level=INFO
javax.enterprise.resource.jdo.level=INFO
javax.enterprise.resource.sqltrace.level=FINE
org.jvnet.hk2.osgiadapter.level=INFO
javax.enterprise.system.ssl.security.level=INFO
ShoalLogger.level=CONFIG
com.hazelcast.level=WARNING
2 changes: 1 addition & 1 deletion nucleus/common/common-util/src/main/java/com/sun/common/util/logging/LoggingConfigImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ private void closePropFile() throws IOException {
throw new IOException();
}
try (OutputStream os = new BufferedOutputStream(new FileOutputStream(file))) {
new SortedLoggingProperties(props).store(os, "GlassFish logging.properties list");
props.store(os, "GlassFish logging.properties list");
os.flush();
fileMonitoring.fileModified(file);
}
Expand Down
78 changes: 0 additions & 78 deletions ...common/common-util/src/main/java/com/sun/common/util/logging/SortedLoggingProperties.java
View file

This file was deleted.

83 changes: 0 additions & 83 deletions ...on/common-util/src/test/java/com/sun/common/util/logging/SortedLoggingPropertiesTest.java
View file

This file was deleted.

Loading

0 comments on commit 151e05d

Please sign in to comment.