name_hashは被る可能性があるので、primaryではなくindexを指定するようにした

[webchat/WebChat.git] / main.js

diff --git a/main.js b/main.js
index 04e9a91..9f013d0 100644 (file)
--- a/main.js
+++ b/main.js
@@ -2,13 +2,7 @@
 //\r
 //設定\r
 //\r
-$enable_profile = true;        //プロファイル機能を使用するなら真。そうでないなら、偽\r
-\r
-$port = process.env.port || 3000;      //ポート\r
-$redisHost = "localhost";      //redisサーバのアドレス\r
-$redisPort = 6379;     //redisサーバのポート\r
-$redisPassword = "";   //redisサーバのパスワード\r
-\r
+var config = require("./configure.js");\r
 //\r
 //\r
 //\r
@@ -20,7 +14,11 @@ var express = require("express");
 var app = express();\r
 var http = require("http");\r
 var RedisStore = require("connect-redis")(express);\r
-var sessionStore = new RedisStore({host:$redisHost,port:$redisPort,pass:$redisPassword});\r
+var sessionStore = new RedisStore({\r
+       host:config.redisHost,\r
+       port:config.redisPort,\r
+       pass:config.redisPassword\r
+});\r
 \r
 // Configuration\r
 \r
@@ -36,6 +34,7 @@ app.configure(function(){
                store:sessionStore,\r
                cookie: { httpOnly: false }\r
        }));\r
+       app.use(express.csrf());\r
        app.use(app.router);\r
        app.use(express.static(__dirname + "/public"));\r
 });\r
@@ -48,10 +47,24 @@ app.configure("production", function(){
   app.use(express.errorHandler()); \r
 });\r
 \r
-if($enable_profile)\r
-       require("./profile")(app);\r
-\r
-var server = http.createServer(app).listen($port);\r
-console.log("Express server listening on port %d in %s mode", $port, app.settings.env);\r
+var async = require("async");\r
 \r
-require("./chat")(app,server,express,sessionStore);\r
+async.waterfall([\r
+       function(next){\r
+               var init = require("./init");\r
+               init(next);\r
+       },\r
+       ],function(err){\r
+               if(err != null)\r
+               {\r
+                       console.log(err);\r
+                       process.exit();\r
+               }\r
+               var server = http.createServer(app).listen(config.port);\r
+               console.log("Express server listening on port %d in %s mode", config.port, app.settings.env);\r
+               \r
+               require("./chat")(app,server,express,sessionStore);\r
+               \r
+               if(config.enable_profile)\r
+                       require("./profile")(app);\r
+       });\r