Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 0 additions & 153 deletions lib/errors/http_error.js

This file was deleted.

18 changes: 0 additions & 18 deletions lib/errors/index.js

This file was deleted.

100 changes: 0 additions & 100 deletions lib/errors/rest_error.js

This file was deleted.

13 changes: 4 additions & 9 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

'use strict';

var errors = require('restify-errors');

var bunyan = require('./bunyan_helper');
var InternalError = require('./errors').InternalError;
var Router = require('./router');
var Server = require('./server');

var shallowCopy = require('./utils').shallowCopy;


var InternalError = errors.InternalError;

/**
* creates a server.
Expand All @@ -19,6 +19,7 @@ var shallowCopy = require('./utils').shallowCopy;
* @returns {Server}
*/
function createServer(options) {

var opts = shallowCopy(options || {});
var server;

Expand Down Expand Up @@ -74,12 +75,6 @@ module.exports = {

};

var errors = require('./errors');
Object.keys(errors).forEach(function (k) {
module.exports.errors[k] = errors[k];
module.exports[k] = errors[k];
});

if (!process.env.RESTIFY_CLIENT_ONLY) {

module.exports.createServer = createServer;
Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/accept.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
var assert = require('assert-plus');
var mime = require('mime');

var NotAcceptableError = require('../errors').NotAcceptableError;
var NotAcceptableError = require('restify-errors').NotAcceptableError;


/**
Expand Down
3 changes: 1 addition & 2 deletions lib/plugins/audit.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@

var assert = require('assert-plus');
var bunyan = require('bunyan');

var HttpError = require('../errors').HttpError;
var HttpError = require('restify-errors').HttpError;


///--- API
Expand Down
3 changes: 1 addition & 2 deletions lib/plugins/authorization.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
'use strict';

var httpSignature = require('http-signature');

var errors = require('../errors');
var errors = require('restify-errors');


///--- Globals
Expand Down
3 changes: 1 addition & 2 deletions lib/plugins/body_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
'use strict';

var assert = require('assert-plus');

var errors = require('../errors');
var errors = require('restify-errors');

var bodyReader = require('./body_reader');
var jsonParser = require('./json_body_parser');
Expand Down
3 changes: 1 addition & 2 deletions lib/plugins/body_reader.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ var crypto = require('crypto');
var zlib = require('zlib');

var assert = require('assert-plus');

var errors = require('../errors');
var errors = require('restify-errors');


///--- Globals
Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/conditional_request.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

'use strict';

var errors = require('../errors');
var errors = require('restify-errors');


///--- Globals
Expand Down
3 changes: 1 addition & 2 deletions lib/plugins/date.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
'use strict';

var assert = require('assert-plus');

var errors = require('../errors');
var errors = require('restify-errors');


///--- Globals
Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/form_body_parser.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var assert = require('assert-plus');
var querystring = require('qs');

var bodyReader = require('./body_reader');
var errors = require('../errors');
var errors = require('restify-errors');


///--- Globals
Expand Down
Loading