moon
/
sync
mirror of https://github.com/calzoneman/sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch from connect to express

This commit is contained in:
calzoneman 2013-04-17 13:42:29 -05:00
parent 8a8838a58d
commit a93e7fe3c2
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -8,7 +8,7 @@
}, },
"dependencies": { "dependencies": {
"socket.io": ">=0.9", "socket.io": ">=0.9",
"connect": "*", "express": ">=3.2",
"mysql-libmysqlclient": "*", "mysql-libmysqlclient": "*",
"node_hash": "*", "node_hash": "*",
"bcrypt": "*" "bcrypt": "*"

13
server.js
View File

@ -9,15 +9,20 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
const VERSION = "1.1.6"; const VERSION = "1.2.0";
var fs = require("fs"); var fs = require("fs");
var Logger = require("./logger.js"); var Logger = require("./logger.js");
Logger.syslog.log("Starting CyTube v" + VERSION); Logger.syslog.log("Starting CyTube v" + VERSION);
var Config = require("./config.js"); var Config = require("./config.js");
var connect = require("connect"); var express = require("express");
var app = connect.createServer(connect.static(__dirname+"/www")).listen(Config.IO_PORT);
exports.io = require("socket.io").listen(app); var app = express();
app.use(express.static(__dirname + "/www"));
var httpserv = app.listen(Config.IO_PORT);
exports.io = require("socket.io").listen(httpserv);
exports.io.set("log level", 1); exports.io.set("log level", 1);
var User = require("./user.js").User; var User = require("./user.js").User;
var Database = require("./database.js"); var Database = require("./database.js");