正在显示
3 个修改的文件
包含
3 行增加
和
8 行删除
@@ -19,6 +19,8 @@ exports = module.exports = function(logger, settings) { | @@ -19,6 +19,8 @@ exports = module.exports = function(logger, settings) { | ||
19 | logger.info('mongo connection opened') | 19 | logger.info('mongo connection opened') |
20 | }) | 20 | }) |
21 | 21 | ||
22 | + connection = _.defaults(connection, mongoose) | ||
23 | + | ||
22 | return connection | 24 | return connection |
23 | 25 | ||
24 | } | 26 | } |
@@ -3,8 +3,6 @@ | @@ -3,8 +3,6 @@ | ||
3 | 3 | ||
4 | // Inspired by `bixby-server` by Jared Hanson | 4 | // Inspired by `bixby-server` by Jared Hanson |
5 | 5 | ||
6 | -var https = require('https') | ||
7 | -var http = require('http') | ||
8 | var cluster = require('cluster') | 6 | var cluster = require('cluster') |
9 | var os = require('os') | 7 | var os = require('os') |
10 | var path = require('path') | 8 | var path = require('path') |
@@ -49,11 +47,6 @@ exports = module.exports = function(logger, settings) { | @@ -49,11 +47,6 @@ exports = module.exports = function(logger, settings) { | ||
49 | 47 | ||
50 | } else { | 48 | } else { |
51 | 49 | ||
52 | - if (settings.server.ssl.enabled) | ||
53 | - this.server = https.createServer(settings.server.ssl.options, this) | ||
54 | - else | ||
55 | - this.server = http.createServer(this) | ||
56 | - | ||
57 | this.server.listen(settings.server.port, settings.server.host, function() { | 50 | this.server.listen(settings.server.port, settings.server.host, function() { |
58 | var addr = this.address() | 51 | var addr = this.address() |
59 | logger.info('app listening on %s:%d', addr.address, addr.port) | 52 | logger.info('app listening on %s:%d', addr.address, addr.port) |
1 | { | 1 | { |
2 | "name": "igloo", | 2 | "name": "igloo", |
3 | - "version": "0.0.4-rc.2", | 3 | + "version": "0.0.4-rc.3", |
4 | "description": "Igloo is a lightweight, fast, and minimal framework for rapid development", | 4 | "description": "Igloo is a lightweight, fast, and minimal framework for rapid development", |
5 | "main": "./lib", | 5 | "main": "./lib", |
6 | "repository": { | 6 | "repository": { |
请
注册
或
登录
后发表评论