diff options
| author |  Vitaly Takmazov | 2016-02-07 22:56:40 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2016-02-07 22:56:40 +0300 |
| commit | fb999f130fc5592e924c39ca2e251cfa03575427 (patch) | |
| tree | f475d5203c24dbc4d1091a59be83cf7479d9b545 /src/main/java/com/juick/http | |
| parent | 35ae74603abe9569554f31d426b54bfc8c680d42 (diff) | |
| parent | ec0e62c6ce7233aaa7b77d619637a501ea11a2b1 (diff) | |
Merge branch 'sans_branch' into develop
Diffstat (limited to 'src/main/java/com/juick/http')
| -rw-r--r-- | src/main/java/com/juick/http/www/Main.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/com/juick/http/www/Main.java b/src/main/java/com/juick/http/www/Main.java index acc6e713..afa50016 100644 --- a/src/main/java/com/juick/http/www/Main.java +++ b/src/main/java/com/juick/http/www/Main.java @@ -38,6 +38,7 @@ import java.sql.SQLException; import java.util.Enumeration; import java.util.Properties; import java.util.concurrent.ExecutorService; +import java.util.logging.LogManager; /** * @@ -68,9 +69,9 @@ public class Main extends HttpServlet implements Stream.StreamListener { @Override public void init() throws ServletException { - super.init(); try { + LogManager.getLogManager().readConfiguration(getServletContext().getResourceAsStream("WEB-INF/logging.properties")); Properties conf = new Properties(); conf.load(getServletContext().getResourceAsStream("WEB-INF/juick.conf")); twitterAuth = new TwitterAuth(conf.getProperty("twitter_consumer_key"), |