Merge branch 'sans_branch' into develop

3 files changed, 4 insertions, 3 deletions

diff --git a/deps/com.juick.server b/deps/com.juick.server
-Subproject 322b18df46eb596ac8db8dc6fd6c544ddf69f8f
+Subproject 8ff7d1d028769e85c39885c954ee8774d008271
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"),
diff --git a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
index b7155643..4a4d3413 100644
--- a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
+++ b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
@@ -151,8 +151,8 @@ public class S2SComponent implements JuickComponent {
 
     public S2SComponent(JuickApplication application, Properties conf) {
         LOGGER.info("component initialized");
-        HOSTNAME = conf.getProperty("hostname");
-        componentName = conf.getProperty("componentname");
+        HOSTNAME = conf.getProperty("hostname", "juick.com");
+        componentName = conf.getProperty("componentname", "s2s");
         STATSFILE = conf.getProperty("statsfile");
         this.sql = application.getSql();
         this.executorService = application.getExecutorService();