Skip to content

Add support for creating workers #2

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for creating workers #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fc927d
If POST, then use curl's -d for params
rajit Nov 25, 2014
2fb5374
Join params once processed into curl args
rajit Nov 26, 2014
313b137
PROD-539: node-cloudcontrol fork does not handle outdated tokens
mshn-fid Feb 27, 2015
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
18 changes: 12 additions & 6 deletions lib/cloudcontrol.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,18 @@ Cloudcontrol.prototype.curl = function curl(options, cb) {
})

url = self.protocol + '://' + self.host + options.path
if (options.params) url += '?'

if (typeof options.params === 'string') url += options.params
if (typeof options.params === 'object') Object.keys(options.params).forEach(function(key) {
url += key + '=' + escape(options.params[key])
})
if (options.params && options.method === 'POST') {
var curlified = Object.keys(options.params).map(function (key) { return '-d ' + key + '=' + options.params[key]; });
cmd += ' ' + curlified.join(' ');
} else if (options.params) {
if (options.params) url += '?'

if (typeof options.params === 'string') url += options.params
if (typeof options.params === 'object') Object.keys(options.params).forEach(function(key) {
url += key + '=' + escape(options.params[key])
})
}
cmd += ' "' + url + '"'
exec(cmd, function(err, result) {
cb(err, result)
Expand Down Expand Up @@ -186,7 +192,7 @@ Cloudcontrol.prototype.request = function request(options, cb) {
try {
result = JSON.parse(result)
} catch(e) {
if (result === "Authorization Required") {
if (result === "Authorization Required" || result === "Unauthorized") {
self.retries++
if (self.retries < 3) {
// try to reauthenticate
Expand Down