Skip to content

Commit cad846a

Browse files
committed
fix
1 parent 1d2aeb1 commit cad846a

File tree

5 files changed

+28
-6
lines changed

5 files changed

+28
-6
lines changed

lib/server/app_server.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ var log_path = path.resolve(__dirname, '..', '..', 'log', ENV + '.log');
99
var logger = bunyan.createLogger({
1010
name: 'app',
1111
streams: [
12+
{
13+
level: 'debug',
14+
stream: process.stdout
15+
},
1216
{
1317
path: log_path,
1418
level: 'debug'
@@ -48,7 +52,7 @@ AppServer.prototype.start = function (options) {
4852

4953
self.server.listen(parseInt(port, 10));
5054

51-
self.server.use(restify.plugins.bodyParser());
55+
self.server.use(restify.plugins.bodyParser({mapParams: true}));
5256
self.server.use(restify.plugins.queryParser());
5357

5458
self.started = true;

lib/server/responder.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ var responder = {
129129
}
130130

131131
res.status(200);
132-
args.stream.pipe(res);
132+
args.stream.pipe(res, { end: false });
133+
args.stream.on('end', function () { res.sendRaw(); });
133134
next();
134135
}
135136
};

test/server/responder.functional.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,17 @@ describe("functional - server/responder.js", function () {
202202
});
203203

204204
after(function () {
205-
fs.unlinkSync(filename);
205+
if (fs.existsSync(filename)) {
206+
fs.unlinkSync(filename);
207+
}
206208
});
207209

208210
it("returns correct headers and content", function (done) {
209211
http_raw_client.get('/test/downloads/content', function (err, data, res, req) {
210212
assert.ifError(err);
211213

212214
req.on('result', function (err, res) {
215+
console.log(err);
213216
assert.ifError(err);
214217

215218
var expected_file_size = fs.statSync(file_to_download).size;

test/server/router.unit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe("server/router.js", function () {
4848

4949
describe("register_routes()", function () {
5050
it("adds routes to server", function () {
51-
assert.ok(Object.keys(server.router.getRoutes()).length === 0);
51+
assert.strictEqual(Object.keys(server.router.getRoutes()).length, 0);
5252
assert.strictEqual(routes.length, 2);
5353

5454
router.register_routes(server, routes);

test/support/http.js

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
var restify = require('restify');
2+
var bunyan = require('bunyan');
23
var clients = require('restify-clients');
34
var host = process.env.HOST || 'localhost';
45
var port = process.env.PORT;
@@ -12,10 +13,23 @@ if (!port) {
1213
}
1314

1415
function TestServer(args) {
16+
var logger = bunyan.createLogger({
17+
name: 'app',
18+
streams: [
19+
{
20+
level: 'trace',
21+
stream: process.stdout
22+
}
23+
]
24+
});
1525
this.routes = args.routes;
16-
this.server = restify.createServer();
17-
this.server.use(restify.plugins.bodyParser());
26+
this.server = restify.createServer({ log: logger });
27+
this.server.use(restify.plugins.bodyParser({mapParams: true}));
1828
this.server.use(restify.plugins.queryParser());
29+
this.server.on('after', restify.plugins.auditLogger({
30+
log: logger,
31+
event: 'after'
32+
}));
1933
main.server.router.register_routes(this.server, this.routes);
2034
}
2135

0 commit comments

Comments
 (0)