Merge branch 'jetty-9.4.x'
This commit is contained in:
commit
ed8310dbff
|
@ -39,8 +39,22 @@
|
|||
<Call id="webappprovider" name="addAppProvider">
|
||||
<Arg>
|
||||
<New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
|
||||
<Set name="monitoredDirName"><Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="webapps"/></Set>
|
||||
<Set name="defaultsDescriptor"><Property name="jetty.home" default="." />/etc/webdefault.xml</Set>
|
||||
<Set name="monitoredDirName">
|
||||
<Property>
|
||||
<Name>jetty.deploy.monitoredPath</Name>
|
||||
<Default>
|
||||
<Property name="jetty.base" default="." />/<Property name="jetty.deploy.monitoredDir" deprecated="jetty.deploy.monitoredDirName" default="webapps"/>
|
||||
</Default>
|
||||
</Property>
|
||||
</Set>
|
||||
<Set name="defaultsDescriptor">
|
||||
<Property>
|
||||
<Name>jetty.deploy.defaultsDescriptorPath</Name>
|
||||
<Default>
|
||||
<Property name="jetty.home" default="." />/etc/webdefault.xml
|
||||
</Default>
|
||||
</Property>
|
||||
</Set>
|
||||
<Set name="scanInterval"><Property name="jetty.deploy.scanInterval" default="1"/></Set>
|
||||
<Set name="extractWars"><Property name="jetty.deploy.extractWars" default="true"/></Set>
|
||||
<Set name="configurationManager">
|
||||
|
|
|
@ -16,6 +16,12 @@ etc/jetty-deploy.xml
|
|||
[ini-template]
|
||||
# Monitored directory name (relative to $jetty.base)
|
||||
# jetty.deploy.monitoredDir=webapps
|
||||
# - OR -
|
||||
# Monitored directory path (fully qualified)
|
||||
# jetty.deploy.monitoredPath=/var/www/webapps
|
||||
|
||||
# Defaults Descriptor for all deployed webapps
|
||||
# jetty.deploy.defaultsDescriptorPath=${jetty.base}/etc/webdefault.xml
|
||||
|
||||
# Monitored directory scan period (seconds)
|
||||
# jetty.deploy.scanInterval=1
|
||||
|
|
|
@ -167,13 +167,18 @@ public class Log
|
|||
return;
|
||||
__initialized = true;
|
||||
|
||||
Boolean announce = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.announce", "true"));
|
||||
|
||||
try
|
||||
{
|
||||
Class<?> log_class = __logClass==null?null:Loader.loadClass(__logClass);
|
||||
if (LOG == null || (log_class!=null && !LOG.getClass().equals(log_class)))
|
||||
{
|
||||
LOG = (Logger)log_class.newInstance();
|
||||
LOG.debug("Logging to {} via {}", LOG, log_class.getName());
|
||||
if(announce)
|
||||
{
|
||||
LOG.debug("Logging to {} via {}", LOG, log_class.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
catch(Throwable e)
|
||||
|
@ -182,8 +187,10 @@ public class Log
|
|||
initStandardLogging(e);
|
||||
}
|
||||
|
||||
if (LOG!=null)
|
||||
if (announce && LOG!=null)
|
||||
{
|
||||
LOG.info(String.format("Logging initialized @%dms to %s",Uptime.getUptime(),LOG.getClass().getName()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -199,7 +206,12 @@ public class Log
|
|||
{
|
||||
log_class = StdErrLog.class;
|
||||
LOG = new StdErrLog();
|
||||
LOG.debug("Logging to {} via {}", LOG, log_class.getName());
|
||||
|
||||
Boolean announce = Boolean.parseBoolean(__props.getProperty("org.eclipse.jetty.util.log.announce", "true"));
|
||||
if(announce)
|
||||
{
|
||||
LOG.debug("Logging to {} via {}", LOG, log_class.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -322,4 +334,9 @@ public class Log
|
|||
{
|
||||
return Collections.unmodifiableMap(__loggers);
|
||||
}
|
||||
|
||||
public static Properties getProperties()
|
||||
{
|
||||
return __props;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue