Merge branch 'master' of git.osdn.net:/gitroot/eos/zephyr

[eos/zephyr.git] / server / app.js

diff --git a/server/app.js b/server/app.js
old mode 100644 (file)
new mode 100755 (executable)
index c2c4222..7f7692b
--- a/server/app.js
+++ b/server/app.js
@@ -2,22 +2,57 @@
 
 'use strict';
 
-var express = require('express'),
-    config  = require('./config'),
-    app     = express(),
-    EventEmitter = require('events').EventEmitter,
-    emitter = new EventEmitter,
-    server  = require('http').Server(app)
+var express = require('express');
+var config  = require('./config');
+var app     = express();
+var EventEmitter = require('events').EventEmitter;
+var emitter = new EventEmitter;
+var server  = require('http').Server(app)
+var ioServer = require('socket.io');
+var ws = require('./class/WebSocket').instance;
 
-require('./express')(app)
-require('./routes')(app)
+require('./express')(app);
+require('./routes')(app);
 
-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'))
-});
+// DBのコンストラクタを実行
+var DB = require('./class/DB').instance;
+DB.init()
+<<<<<<< HEAD
+//.then(function() {
+//    return DB.test2();
+//})
+=======
+/*
+.then(function() {
+    return DB.test2();
+})*/
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
+.then(function() {
+    if(process.env.NODE_ENV === 'debug') {
+        return DB.testRest();
+    }
+})
+.then(function() {
+    var server = app.listen(config.port, config.ip, function () {
+<<<<<<< HEAD
+      /*
+      switch (req.method) {
+        case 'GET':
+        show(req, res);
+        break;
+        case 'POST':
+        upload(req, res);
+        break;
+      }
+      */
+=======
+>>>>>>> 6b2b2b88511733893d2c6e7848c389abfcd53ba6
+        console.log('Zephyr listening at http://%s:%s', config.ip, config.port);
+        console.log('NODE_ENV = ' + app.get('env'))
+    });
 
-var io = require('socket.io').listen(server)
-require('./ws')(io)
+    var io = ioServer.listen(server);
+    ws.connect(io);
+});
 
 exports = module.exports = app;