Skip to content
This repository was archived by the owner on May 27, 2020. It is now read-only.

Commit

Permalink
Change warn logs to debug logs
Browse files Browse the repository at this point in the history
  • Loading branch information
@LaurenSpiegel
LaurenSpiegel committed Mar 2, 2017
1 parent e096c49 commit f549a1b
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 26 deletions.
2 changes: 1 addition & 1 deletion lib/api/objectDelete.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { pushMetric } from '../utapi/utilities';
export default function objectDelete(authInfo, request, log, cb) {
log.debug('processing request', { method: 'objectDelete' });
if (authInfo.isRequesterPublicUser()) {
log.warn('operation not available for public user');
log.debug('operation not available for public user');
return cb(errors.AccessDenied);
}
const bucketName = request.bucketName;
Expand Down
2 changes: 1 addition & 1 deletion lib/api/serviceGet.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default function serviceGet(authInfo, request, log, callback) {
log.debug('processing request', { method: 'serviceGet' });

if (authInfo.isRequesterPublicUser()) {
log.warn('operation not available for public user');
log.debug('operation not available for public user');
return callback(errors.AccessDenied);
}
const xml = [];
Expand Down
2 changes: 1 addition & 1 deletion lib/kms/common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export default class Common {
cryptoScheme, dataKey, log,
(err, derivedKey, derivedIV) => {
if (err) {
log.warn('key derivation failed', { error: err });
log.debug('key derivation failed', { error: err });
return cb(err);
}
const aesBlockSize = this._aesBlockSize();
Expand Down
12 changes: 6 additions & 6 deletions lib/kms/wrapper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default class KMS {
log.debug('creating a new bucket key');
client.createBucketKey(bucketName, log, (err, masterKeyId) => {
if (err) {
log.warn('error from kms', { implName, error: err });
log.debug('error from kms', { implName, error: err });
return cb(err);
}
log.trace('bucket key created in kms');
Expand Down Expand Up @@ -123,7 +123,7 @@ export default class KMS {
log.debug('deleting bucket key', { bucketKeyId });
client.destroyBucketKey(bucketKeyId, log, err => {
if (err) {
log.warn('error from kms', { implName, error: err });
log.debug('error from kms', { implName, error: err });
return cb(err);
}
log.trace('bucket key destroyed in kms');
Expand Down Expand Up @@ -178,7 +178,7 @@ export default class KMS {
serverSideEncryptionInfo.masterKeyId,
dataKey, log, (err, cipheredDataKey) => {
if (err) {
log.warn('error from kms',
log.debug('error from kms',
{ implName, error: err });
return next(err);
}
Expand All @@ -194,7 +194,7 @@ export default class KMS {
dataKey, 0, log, (err, cipher) => {
dataKey.fill(0);
if (err) {
log.warn('error from kms',
log.debug('error from kms',
{ implName, error: err });
return next(err);
}
Expand Down Expand Up @@ -255,7 +255,7 @@ export default class KMS {
log, (err, plainTextDataKey) => {
log.debug('deciphering a data key');
if (err) {
log.warn('error from kms',
log.debug('error from kms',
{ implName, error: err });
return next(err);
}
Expand All @@ -269,7 +269,7 @@ export default class KMS {
plainTextDataKey, offset, log, (err, decipher) => {
plainTextDataKey.fill(0);
if (err) {
log.warn('error from kms',
log.debug('error from kms',
{ implName, error: err });
return next(err);
}
Expand Down
14 changes: 7 additions & 7 deletions lib/metadata/wrapper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const metadata = {
log.debug('creating bucket in metadata');
client.createBucket(bucketName, bucketMD, log, err => {
if (err) {
log.warn('error from metadata', { implName, error: err });
log.debug('error from metadata', { implName, error: err });
return cb(err);
}
log.trace('bucket created in metadata');
Expand All @@ -35,7 +35,7 @@ const metadata = {
log.debug('updating bucket in metadata');
client.putBucketAttributes(bucketName, bucketMD, log, err => {
if (err) {
log.warn('error from metadata', { implName, error: err });
log.debug('error from metadata', { implName, error: err });
return cb(err);
}
log.trace('bucket updated in metadata');
Expand Down Expand Up @@ -71,7 +71,7 @@ const metadata = {
log.debug('putting object in metdata');
client.putObject(bucketName, objName, objVal, log, err => {
if (err) {
log.warn('error from metadata', { implName, error: err });
log.debug('error from metadata', { implName, error: err });
return cb(err);
}
log.debug('object successfully put in metadata');
Expand All @@ -97,7 +97,7 @@ const metadata = {
log.debug('getting object from metadata');
client.getObject(bucketName, objName, log, (err, data) => {
if (err) {
log.warn('error from metadata', { implName, err });
log.debug('error from metadata', { implName, err });
return cb(err);
}
log.debug('object retrieved from metadata');
Expand All @@ -109,7 +109,7 @@ const metadata = {
log.debug('deleting object from metadata');
client.deleteObject(bucketName, objName, log, err => {
if (err) {
log.warn('error from metadata', { implName, err });
log.debug('error from metadata', { implName, err });
return cb(err);
}
log.debug('object deleted from metadata');
Expand All @@ -123,7 +123,7 @@ const metadata = {
log, (err, data) => {
log.debug('getting object listing from metadata');
if (err) {
log.warn('error from metadata', { implName, err });
log.debug('error from metadata', { implName, err });
return cb(err);
}
log.debug('object listing retrieved from metadata');
Expand All @@ -136,7 +136,7 @@ const metadata = {
(err, data) => {
log.debug('getting mpu listing from metadata');
if (err) {
log.warn('error from metadata', { implName, err });
log.debug('error from metadata', { implName, err });
return cb(err);
}
log.debug('mpu listing retrieved from metadata');
Expand Down
4 changes: 2 additions & 2 deletions lib/routes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default function routes(req, res, logger) {
// if empty name and request not a list Buckets
if (!req.bucketName &&
!(req.method.toUpperCase() === 'GET' && !req.objectKey)) {
log.warn('empty bucket name', { method: 'routes' });
log.debug('empty bucket name', { method: 'routes' });
const err = (req.method.toUpperCase() !== 'OPTIONS') ?
errors.MethodNotAllowed : errors.AccessForbidden
.customizeDescription('CORSResponse: Bucket not found');
Expand All @@ -95,7 +95,7 @@ export default function routes(req, res, logger) {

if (req.bucketName !== undefined &&
utils.isValidBucketName(req.bucketName) === false) {
log.warn('invalid bucket name', { bucketName: req.bucketName });
log.debug('invalid bucket name', { bucketName: req.bucketName });
return routesUtils.responseXMLBody(errors.InvalidBucketName,
undefined, res, log);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/routePUT.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export default function routePUT(request, response, log, statsClient) {
request.contentMD5 = Buffer.from(request.contentMD5, 'base64')
.toString('hex');
if (request.contentMD5 && request.contentMD5.length !== 32) {
log.warn('invalid md5 digest', {
log.debug('invalid md5 digest', {
contentMD5: request.contentMD5,
});
return routesUtils
Expand Down
2 changes: 1 addition & 1 deletion lib/routes/routesUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function setCommonResponseHeaders(headers, response, log) {
try {
response.setHeader(key, headers[key]);
} catch (e) {
log.warn('header can not be added ' +
log.debug('header can not be added ' +
'to the response', { header: headers[key],
error: e.stack, method: 'setCommonResponseHeaders' });
}
Expand Down
2 changes: 1 addition & 1 deletion lib/server.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class S3Server {
initiateStartup(log) {
clientCheck(log, (err, results) => {
if (err) {
log.warn('initial health check failed, delaying startup', {
log.info('initial health check failed, delaying startup', {
error: err,
healthStatus: results,
});
Expand Down
6 changes: 3 additions & 3 deletions lib/services.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ export default {
log.trace('parsing acl from headers');
acl.parseAclFromHeaders(parseAclParams, (err, parsedACL) => {
if (err) {
log.warn('error parsing acl', { error: err });
log.debug('error parsing acl', { error: err });
return cb(err);
}
omVal.acl = parsedACL;
Expand Down Expand Up @@ -310,7 +310,7 @@ export default {
});
}
// versioning
log.warn('deleteObject: versioning not fully implemented');
log.debug('deleteObject: versioning not fully implemented');
return metadata.deleteObjectMD(bucketName, objectKey, log, cb);
},

Expand All @@ -331,7 +331,7 @@ export default {
metadata.listObject(bucketName, listingParams, log,
(err, listResponse) => {
if (err) {
log.warn('error from metadata', { error: err });
log.debug('error from metadata', { error: err });
return cb(err);
}
return cb(null, listResponse);
Expand Down
4 changes: 2 additions & 2 deletions lib/utilities/aclUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ aclUtils.handleCannedGrant =
aclUtils.parseAclXml = function parseAclXml(toBeParsed, log, next) {
return parseString(toBeParsed, (err, result) => {
if (err) {
log.warn('invalid xml', { xmlObj: toBeParsed });
log.debug('invalid xml', { xmlObj: toBeParsed });
return next(errors.MalformedXML);
}
if (!result.AccessControlPolicy
Expand All @@ -114,7 +114,7 @@ aclUtils.parseAclXml = function parseAclXml(toBeParsed, log, next) {
|| (result.AccessControlPolicy.AccessControlList[0] !== '' &&
Object.keys(result.AccessControlPolicy.AccessControlList[0])
.some(listKey => listKey !== 'Grant'))) {
log.warn('invalid acl', { acl: result });
log.debug('invalid acl', { acl: result });
return next(errors.MalformedACLError);
}
const jsonGrants = result
Expand Down

0 comments on commit f549a1b

Please sign in to comment.