Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
4 changes: 0 additions & 4 deletions packages/error-reporting/.jshintignore

This file was deleted.

27 changes: 0 additions & 27 deletions packages/error-reporting/.jshintrc

This file was deleted.

3 changes: 2 additions & 1 deletion packages/error-reporting/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"scripts": {
"test": "nyc --exclude=\"fuzzer.js\" mocha ./test/unit/*.js",
"system-test": "nyc --exclude=\"error-message.js\" mocha ./system-test/*.js",
"lint": "jshint src/ index.js",
"lint": "jshint -c ../../.jshintrc src system-test test utils && jscs -c ../../.jscsrc src system-test test utils",
"publish-module": "node ../../scripts/publish.js error-reporting"
},
"author": "Google Inc.",
Expand All @@ -15,6 +15,7 @@
"body-parser": "^1.15.1",
"express": "^4.13.4",
"hapi": "^16.1.0",
"jscs": "^3.0.7",
"jshint": "^2.9.2",
"koa": "^1.2.0",
"lodash.assign": "^4.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/error-reporting/src/configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ Configuration.prototype._checkAuthConfiguration = function() {
* id or error encountered during id capture
* @returns {Undefined} - does not return anything
*/
Configuration.prototype._checkLocalProjectId = function(cb) {
Configuration.prototype._checkLocalProjectId = function() {
if (isString(this._projectId)) {
// already has been set by the metadata service
return this._projectId;
Expand Down Expand Up @@ -355,7 +355,7 @@ Configuration.prototype.getShouldReportErrorsToAPI = function() {
* @function getProjectId
* @returns {String|Null} - returns the _projectId property
*/
Configuration.prototype.getProjectId = function(cb) {
Configuration.prototype.getProjectId = function() {
return this._checkLocalProjectId();
};
/**
Expand Down
9 changes: 5 additions & 4 deletions packages/error-reporting/src/logger.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,19 @@ var logger = require('@google-cloud/common').logger;
*/
function createLogger(initConfiguration) {
// Default to log level: warn (2)
var level = logger.WARN;
var DEFAULT_LEVEL = logger.LEVELS[2];
var level = DEFAULT_LEVEL;
if (has(process.env, 'GCLOUD_ERRORS_LOGLEVEL')) {
// Cast env string as integer
level = logger.LEVELS[~~process.env.GCLOUD_ERRORS_LOGLEVEL] ||
logger.LEVELS.warn;
DEFAULT_LEVEL;
} else if (isObject(initConfiguration) &&
has(initConfiguration, 'logLevel')) {
if (isString(initConfiguration.logLevel)) {
// Cast string as integer
level = logger.LEVELS[~~initConfiguration.logLevel] || logger.LEVELS.warn;
level = logger.LEVELS[~~initConfiguration.logLevel] || DEFAULT_LEVEL;
} else if (isNumber(initConfiguration.logLevel)) {
level = logger.LEVELS[initConfiguration.logLevel] || logger.LEVELS.warn;
level = logger.LEVELS[initConfiguration.logLevel] || DEFAULT_LEVEL;
} else {
throw new Error('config.logLevel must be a number or decimal ' +
'representation of a number in string form');
Expand Down
9 changes: 6 additions & 3 deletions packages/error-reporting/system-test/testAuthClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ const TEST_RUNNER = (function() {
describe('Receiving non-retryable errors', function() {
it('Should fail', function(done) {
this.timeout(5000);
client.sendError({}, function(err, response, body) {
client.sendError({}, function(err, response,
/* jshint unused:false */ body) {
assert(err instanceof Error);
assert.strictEqual(err.message.toLowerCase(),
'message cannot be empty.');
Expand All @@ -150,7 +151,8 @@ const TEST_RUNNER = (function() {
intendedTries);
return {error: 'Please try again later'};
});
client.sendError(errorMessage, function(err, response, body) {
client.sendError(errorMessage, function(err, response,
/* jshint unused:false */ body) {
assert.strictEqual(tries, intendedTries);
done();
});
Expand Down Expand Up @@ -302,7 +304,8 @@ const TEST_RUNNER = (function() {
});
after(() => env.sterilizeProcess());
it('Should callback with an error', function(done) {
client.sendError({}, function(err, response, body) {
client.sendError({}, function(err, response,
/* jshint unused:false */ body) {
assert(err instanceof Error);
assert.strictEqual(err.message, ERROR_STRING);
assert.strictEqual(response, null);
Expand Down
24 changes: 24 additions & 0 deletions packages/error-reporting/test/unit/testLogger.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,33 @@ describe('logger', function() {
});
});
describe('Default log level', function() {
var oldLog;
var text;
beforeEach(function() {
oldLog = console.log;
text = '';
console.log = function() {
oldLog.apply(this, arguments);
for (var i=0; i<arguments.length; i++) {
text += arguments[i];
}
};
});
afterEach(function() {
text = undefined;
console.log = oldLog;
});
it('Should be able to WARN by default', function() {
var logger = createLogger();
logger.warn('test warning message');
assert.strictEqual(text,
'WARN:@google/cloud-errors: test warning message');
});
it('Should be able to ERROR by default', function() {

This comment was marked as spam.

This comment was marked as spam.

var logger = createLogger();
logger.error('test error message');
assert.strictEqual(text,
'ERROR:@google/cloud-errors: test error message');
});
});
});
Expand Down