X-Git-Url: http://git.osdn.net/view?p=eos%2Fzephyr.git;a=blobdiff_plain;f=server%2Fapp.js;h=e410f128c6c520577b4127bbb68d3fbcd6c260a8;hp=bc9f28ef344af902cf3345383cb955c20b0d347f;hb=d9faf4befdc87347d89514f566fc6fb33ccc9cd4;hpb=d46bddbc371de708a21b976ffcc0e37550de1bfc diff --git a/server/app.js b/server/app.js index bc9f28e..e410f12 100644 --- a/server/app.js +++ b/server/app.js @@ -15,16 +15,17 @@ require('./routes')(app); // DBのコンストラクタを実行 var DB = require('./class/DB').instance; DB.init() +.then(function() { + return DB.test2(); +}) .then(function(methods) { - console.log(DB); -}); + var server = app.listen(config.port, config.ip, function () { + console.log('Zephyr listening at http://%s:%s', config.ip, config.port); + console.log(app.get('env')) + }); -var server = app.listen(config.port, config.ip, function () { - console.log('Zephyr listening at http://%s:%s', config.ip, config.port); - console.log(app.get('env')) + var io = require('socket.io').listen(server); + require('./ws')(io); }); -var io = require('socket.io').listen(server); -require('./ws')(io); - //exports = module.exports = app;