YunxiaoXu/hexo-deployer-s3-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed obnoxious logging

Browse Source
This commit is contained in:
Jack Guy
2016-01-09 15:02:47 -06:00
parent c0070e9578
commit bd5e7ec966
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/deployer.js
View File

@@ -3,16 +3,16 @@ var chalk = require('chalk');
module.exports = function(args) { module.exports = function(args) {
var config = { var config = {
maxAsyncS3: args.concurrency, maxAsyncS3: args.concurrency,
s3Options: { s3Options: {
accessKeyId: args.aws_key || process.env.AWS_KEY, accessKeyId: args.aws_key || process.env.AWS_KEY,
secretAccessKey: args.aws_secret || process.env.AWS_SECRET, secretAccessKey: args.aws_secret || process.env.AWS_SECRET,
region: args.region region: args.region
} }
}; };
var client = s3.createClient(config); var client = s3.createClient(config);
var publicDir = this.config.public_dir; var publicDir = this.config.public_dir;
var log = this.log; var log = this.log;
@@ -28,28 +28,29 @@ module.exports = function(args) {
help += ' [aws_secret]: <aws_secret> # Optional, if provided as environment variable\n'; help += ' [aws_secret]: <aws_secret> # Optional, if provided as environment variable\n';
help += ' [concurrency]: <concurrency>\n'; help += ' [concurrency]: <concurrency>\n';
help += ' [region]: <region> # See https://github.com/LearnBoost/knox#region\n\n', help += ' [region]: <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); console.log(help);
return; return;
} }
var params = { var params = {
localDir: publicDir, localDir: publicDir,
deleteRemoved: true, deleteRemoved: true,
s3Params: { s3Params: {
Bucket: args.bucket Bucket: args.bucket
} }
} }
var uploader = client.uploadDir(params); var uploader = client.uploadDir(params);
log.info('Uploading...');
return uploader return uploader
.on('progress', function() { .on('progress', function() {
log.info(uploader.progressAmount + ' / ' + uploader.progressTotal); // log.info(uploader.progressAmount + ' / ' + uploader.progressTotal);
}).on('end', function() { }).on('end', function() {
log.info('Done!'); log.info('Done!');
}).on('error', function(err) { }).on('error', function(err) {
log.error(err) log.error(err)
}); });
}; };