Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
adapt
ace
Commits
f7d71b7d
Commit
f7d71b7d
authored
May 21, 2018
by
Michael Ritter
Browse files
#43
Persist default log4j settings if none are found
parent
829ef374
Changes
1
Show whitespace changes
Inline
Side-by-side
ace-am/src/main/java/edu/umiacs/ace/util/LogContextListener.java
View file @
f7d71b7d
...
...
@@ -32,6 +32,7 @@
package
edu.umiacs.ace.util
;
import
edu.umiacs.ace.monitor.settings.SettingsParameter
;
import
edu.umiacs.ace.monitor.settings.SettingsUtil
;
import
org.apache.log4j.PropertyConfigurator
;
import
javax.persistence.EntityManager
;
...
...
@@ -40,6 +41,7 @@ import javax.servlet.ServletContextEvent;
import
javax.servlet.ServletContextListener
;
import
java.util.List
;
import
java.util.Properties
;
import
java.util.stream.Collectors
;
/**
* Configure log4j on startup
...
...
@@ -52,12 +54,18 @@ public class LogContextListener implements ServletContextListener {
public
void
contextInitialized
(
ServletContextEvent
arg0
)
{
Properties
log4jProp
=
new
Properties
();
// what happens when this is empty?
EntityManager
em
=
PersistUtil
.
getEntityManager
();
TypedQuery
<
SettingsParameter
>
q
=
em
.
createNamedQuery
(
"SettingsParameter.getAttrList"
,
SettingsParameter
.
class
);
q
.
setParameter
(
"attr"
,
"%log4j%"
);
List
<
SettingsParameter
>
settings
=
q
.
getResultList
();
if
(
settings
.
isEmpty
())
{
settings
=
SettingsUtil
.
getDefaultSettings
()
.
stream
()
.
filter
(
s
->
s
.
getName
().
startsWith
(
"log4"
))
.
collect
(
Collectors
.
toList
());
SettingsUtil
.
updateSettings
(
settings
);
}
for
(
SettingsParameter
s:
settings
)
{
log4jProp
.
setProperty
(
s
.
getName
(),
s
.
getValue
());
...
...
@@ -68,6 +76,5 @@ public class LogContextListener implements ServletContextListener {
@Override
public
void
contextDestroyed
(
ServletContextEvent
arg0
)
{
// throw new UnsupportedOperationException("Not supported yet.");
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment