Fixed obnoxious logging
This commit is contained in:
@@ -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]: <aws_secret> # Optional, if provided as environment variable\n';
|
||||
help += ' [concurrency]: <concurrency>\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);
|
||||
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)
|
||||
});
|
||||
};
|
||||
Reference in New Issue
Block a user