From bd5e7ec966e709dd0a3d1c473d30f421be8bf97d Mon Sep 17 00:00:00 2001 From: Jack Guy Date: Sat, 9 Jan 2016 15:02:47 -0600 Subject: [PATCH] Fixed obnoxious logging --- lib/deployer.js | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/lib/deployer.js b/lib/deployer.js index 791df7a..f66ea77 100644 --- a/lib/deployer.js +++ b/lib/deployer.js @@ -3,16 +3,16 @@ var chalk = require('chalk'); module.exports = function(args) { - var config = { - maxAsyncS3: args.concurrency, - s3Options: { - accessKeyId: args.aws_key || process.env.AWS_KEY, - secretAccessKey: args.aws_secret || process.env.AWS_SECRET, - region: args.region - } - }; + var config = { + maxAsyncS3: args.concurrency, + s3Options: { + accessKeyId: args.aws_key || process.env.AWS_KEY, + secretAccessKey: args.aws_secret || process.env.AWS_SECRET, + region: args.region + } + }; var client = s3.createClient(config); - + var publicDir = this.config.public_dir; var log = this.log; @@ -28,28 +28,29 @@ module.exports = function(args) { help += ' [aws_secret]: # Optional, if provided as environment variable\n'; help += ' [concurrency]: \n'; help += ' [region]: # See https://github.com/LearnBoost/knox#region\n\n', - help += 'For more help, you can check the docs: ' + chalk.underline('https://github.com/nt3rp/hexo-deployer-s3'); + help += 'For more help, you can check the docs: ' + chalk.underline('https://github.com/nt3rp/hexo-deployer-s3'); console.log(help); return; } - + var params = { - localDir: publicDir, - deleteRemoved: true, - s3Params: { - Bucket: args.bucket - } + localDir: publicDir, + deleteRemoved: true, + s3Params: { + Bucket: args.bucket + } } var uploader = client.uploadDir(params); - + log.info('Uploading...'); + return uploader - .on('progress', function() { - log.info(uploader.progressAmount + ' / ' + uploader.progressTotal); - }).on('end', function() { - log.info('Done!'); - }).on('error', function(err) { - log.error(err) - }); + .on('progress', function() { + // log.info(uploader.progressAmount + ' / ' + uploader.progressTotal); + }).on('end', function() { + log.info('Done!'); + }).on('error', function(err) { + log.error(err) + }); }; \ No newline at end of file