ソケットの終了処理追加。

[wordring-tm/wordring-tm.git] / proxy / main.cpp

diff --git a/proxy/main.cpp b/proxy/main.cpp
index 2591b69..f6f09e9 100644 (file)
--- a/proxy/main.cpp
+++ b/proxy/main.cpp
@@ -49,6 +49,9 @@ int main(int argc, char *argv[])
        if(!settings.contains("SocketServer/port")) settings.setValue("SocketServer/port", 8081);
        // ProxyModule
        if(!settings.contains("ProxyModule/prefix")) settings.setValue("ProxyModule/prefix", "/?");
+       // ProxyHandler
+       if(!settings.contains("ProxyHandler/jscode"))
+               settings.setValue("ProxyHandler/jscode", "C:/Users/Kouichi/Documents/OSDN/wordring-tm/proxy/tm.js");
 
        // Database
        if(!settings.contains("Database/root"))
@@ -64,11 +67,12 @@ int main(int argc, char *argv[])
        service->load_languages(QApplication::applicationDirPath() + "/plugins");
 
        HttpServer *server = new HttpServer(&settings, &w);
+       w.set_http_port(server->port());
 
-       TM::SocketServer *socket = new TM::SocketServer(&settings, w.editor_widget(), &w);
+       TM::SocketServer *socket = new TM::SocketServer(&settings, service, w.editor_widget(), &w);
 
        server->install(new TM::ProxyModule(
-                                               "/tm?", server->port(), socket->port(), server));
+                                               &settings, server->port(), socket->port(), server));
 
        QObject::connect(&w, SIGNAL(closing()), socket, SLOT(abort()));
        w.show();