fixup on code post reviews

Author: benzekrimaha

CountItems/CountManager.js

@@ -175,15 +175,7 @@ class CountManager {
         this.store.buckets += bucketCount;
         this.store.bucketList = this.store.bucketList.concat(transformedInfos);
         bucketInfos.forEach(bucketInfo => {
-            this.q.push({bucketInfo}, err => {
-                if (err) {
-                    this.log.error('error processing bucket', {
-                        error: err,
-                        method: 'CountManager::addWork',
-                    });
-                }
-            }
-            );
+            this.q.push(bucketInfo);
         });
         this.log.debug('added work', {
             workInQueue: this.q.length(),
@@ -206,6 +198,10 @@ class CountManager {
                 .forEach(worker => this.workerList.push(worker.id));
         }
         this.q.error(err => {
+            this.log.error('error processing bucket', {
+                error: err,
+                method: 'CountManager::addWork',
+            });
             this.q.pause();
             this.q.kill();
             return process.nextTick(onceCB, err);

CountItems/CountWorker.js

@@ -36,7 +36,7 @@ class CountWorker {
         if (bucketInfoObj._websiteConfiguration) {
             Object.assign(bucketInfoObj, { _websiteConfiguration: null });
         }
-        const bucketInfo = BucketInfo.fromObj(bucketInfoObj.bucketInfo ? bucketInfoObj.bucketInfo : bucketInfoObj);
+        const bucketInfo = BucketInfo.fromObj(bucketInfoObj.bucketInfo || bucketInfoObj);
         const bucketName = bucketInfo.getName();
         this.log.info(`${process.pid} handling ${bucketName}`);
         return async.waterfall([

compareBuckets/compareBuckets.js

@@ -224,7 +224,7 @@ function compareBuckets(params, log, cb) {
         err => {
             statusObj.dstBucketInProgress = null;
             statusObj.srcBucketInProgress = null;
-            cb(err, statusObj);
+            cb(err);
         }
     );
 }