Skip to content

Add more logging in the autofork route #1251

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
bkendall merged 3 commits into from
Jan 11, 2016
Merged

Add more logging in the autofork route #1251

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0d38f6e
Adding logging
Nathan219 Dec 28, 2015
3e3041f
pull out common log elements
Jan 8, 2016
bb7e5ec
Update runnable.js
Jan 11, 2016
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
9 changes: 7 additions & 2 deletions lib/models/apis/runnable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var ExpressRequest = require('express-request')
var RunnableUser = require('runnable')
var async = require('async')
var isFunction = require('101/is-function')
var put = require('101/put')
var util = require('util')

var Base = require('runnable/lib/models/base')
Expand Down Expand Up @@ -101,9 +102,10 @@ Runnable.prototype.copyInstance = function (sessionUser, build, parentInstance,
* @param {Function} cb standard callback - (err, forkedInstance)
*/
Runnable.prototype.forkMasterInstance = function (masterInst, buildId, branch, cb) {
log.info({
var logData = {
tx: true
}, 'Runnable.prototype.forkMasterInstance')
}
log.info(logData, 'Runnable.prototype.forkMasterInstance')
// basically only letters, numbers and - are allowed in domain names
var sanitizedBranch = branch.replace(/[^a-zA-Z0-9]/g, '-')
var body = {
Expand All @@ -121,10 +123,13 @@ Runnable.prototype.forkMasterInstance = function (masterInst, buildId, branch, c
'env:' + process.env.NODE_ENV
]
this.createInstance(body, function (err, instance) {
logData.body = body
if (err) {
log.error(put(logData, { err: err }), 'forkMasterInstance failure')
cb(err)
dogstatsd.increment('api.runnable.fork_master_instance.error', 1, tags)
} else {
log.info(logData, 'forkMasterInstance success')
cb(null, instance)
dogstatsd.increment('api.runnable.fork_master_instance.success', 1, tags)
}
Expand Down