[Develop and manual Test] API endpoint (post) /api/v1/fileUpload

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

diff --git a/server/app.js b/server/app.js
index 9e12a77..e410f12 100644 (file)
--- a/server/app.js
+++ b/server/app.js
@@ -1,29 +1,31 @@
-'use strict';
-
-var express = require('express'),
-    config  = require('./config'),
-    app     = express(),
-    EventEmitter = require('events').EventEmitter,
-    emitter = new EventEmitter,
-    server  = require('http').Server(app)
+#!/usr/bin/env node --harmony
 
-require('./express')(app)
-require('./routes')(app)
-
-var server = app.listen(config.port, config.ip, function () {
-    console.log(__dirname)
-    console.log(config.root);
-    console.log('iEos listening at http://%s:%s', config.ip, config.port);
-    console.log(app.get('env'))
+'use strict';
 
-    
+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)
+
+require('./express')(app);
+require('./routes')(app);
+
+// DBのコンストラクタを実行
+var DB = require('./class/DB').instance;
+DB.init()
+.then(function() {
+    return DB.test2();
+})
+.then(function(methods) {
+    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)
-
-io.on('connection', function(socket) {
-        console.log("WebSocket was connected")
-    })
-
-
-exports = module.exports = app;
+//exports = module.exports = app;