Skip to content

[minor] Allow the timeout to be customized #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3rd-Eden merged 1 commit into from
Oct 1, 2012
Merged

[minor] Allow the timeout to be customized #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions node.js/lib/client/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var Client = exports.Client = function (options) {
if (typeof this.options.get !== 'function') {
this.options.get = function (key) {
return this[key];
}
};
}

};
Expand All @@ -38,9 +38,9 @@ util.inherits(Client, EventEmitter);
// #### @body {Object} **optional** JSON Request Body
// #### @callback {function} Continuation to call if errors occur.
// #### @success {function} Continuation to call upon successful transactions
// Makes a request to `this.remoteUri + uri` using `method` and any
// Makes a request to `this.remoteUri + uri` using `method` and any
// `body` (JSON-only) if supplied. Short circuits to `callback` if the response
// code from Nodejitsu matches `failCodes`.
// code from Nodejitsu matches `failCodes`.
//
Client.prototype.request = function (method, uri /* variable arguments */) {
var options, args = Array.prototype.slice.call(arguments),
Expand All @@ -57,16 +57,16 @@ Client.prototype.request = function (method, uri /* variable arguments */) {
'Authorization': 'Basic ' + encoded,
'Content-Type': 'application/json'
},
timeout: 8 * 60 * 1000
timeout: this.options.get('timeout') || 8 * 60 * 1000
};

if (body) {
options.body = JSON.stringify(body);
}
}
else if (method !== 'GET') {
options.body = '{}';
}

if (proxy) {
options.proxy = proxy;
}
Expand Down Expand Up @@ -112,13 +112,13 @@ Client.prototype.request = function (method, uri /* variable arguments */) {
};

//
// ### function upload (uri, contentType, file, callback, success)
// ### function upload (uri, contentType, file, callback, success)
// #### @uri {Array} Locator for the Remote Resource
// #### @contentType {string} Content-Type header to use for the upload.
// #### @file {string} Path of the local file to upload.
// #### @file {string} Path of the local file to upload.
// #### @success {function} Continuation to call upon successful transactions
// #### @callback {function} Continuation to call if errors occur.
// Makes a `POST` request to `this.remoteUri + uri` with the data in `file`
// Makes a `POST` request to `this.remoteUri + uri` with the data in `file`
// as the request body. Short circuits to `callback` if the response
// code from Nodejitsu matches `failCodes`.
//
Expand Down