diff options
author | Ugnich Anton | 2013-08-14 09:21:47 +0700 |
---|---|---|
committer | Ugnich Anton | 2013-08-14 09:21:47 +0700 |
commit | 2a8c4f613f397619c563fbb74c04e39074d6e98e (patch) | |
tree | 233015f82f5766515fe9aeeeb07605bcf9ef217a /src/com/juick/jabber/ws/Main.java | |
parent | db2d48c068715c2841fd60b955c98580236c400d (diff) |
RFC 6455
Diffstat (limited to 'src/com/juick/jabber/ws/Main.java')
-rw-r--r-- | src/com/juick/jabber/ws/Main.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/juick/jabber/ws/Main.java b/src/com/juick/jabber/ws/Main.java index 7036b0d4..a7aea543 100644 --- a/src/com/juick/jabber/ws/Main.java +++ b/src/com/juick/jabber/ws/Main.java @@ -32,9 +32,8 @@ public class Main { Connection sql; XMPPConnection xmpp; - public final static ArrayList<SocketSubscribed> sockReplies = new ArrayList<SocketSubscribed>(); - public final static ArrayList<SocketSubscribed> sockMessages = new ArrayList<SocketSubscribed>(); - public final static ArrayList<SocketSubscribed> sockAll = new ArrayList<SocketSubscribed>(); + public static String STATSFILE = null; + public final static ArrayList<SocketSubscribed> clients = new ArrayList<SocketSubscribed>(); public static void main(String[] args) { new Main().start(); @@ -45,11 +44,14 @@ public class Main { Properties conf = new Properties(); conf.load(new FileInputStream("/etc/juick/ws.conf")); + STATSFILE = conf.getProperty("statsfile"); + setupSql(conf.getProperty("mysql_username", ""), conf.getProperty("mysql_password", "")); xmpp = new XMPPConnection(sql, conf.getProperty("xmpp_password", "")); new Thread(xmpp).start(); + + //new Thread(new WSConnections()).start(); new Thread(new WSData(sql)).start(); - new Thread(new WSConnections()).start(); new Thread(new WSKeepAlive(sql)).start(); } catch (Exception e) { System.err.println(e); |