localized entry sync bug fixed

Author: iyerrama29

lib/publish.js

@@ -205,7 +205,7 @@ Publish.prototype.init = function() {
           } else if (body && body.user && body.user.authtoken) {
             return cb(null, body.user.authtoken);
           }
-          log(error('Something went wrong while logging in..'));
+          debug('Something went wrong while logging in..');
           return cb(body);
         });
       },
@@ -241,7 +241,7 @@ Publish.prototype.init = function() {
             var envNotPresent = [];
             inputs.environment.forEach(function (envName) {
               if (envNames.indexOf(envName) === -1) {
-                log(error(`${envName} was not found!`));
+                debug(`${envName} was not found!`);
                 envNotPresent.push(envName);
               }
             });
@@ -306,7 +306,7 @@ Publish.prototype.loadEntries = function(contentTypes, callback) {
       }
       entries = entries || [];
       log(success(`A total of ${entries.length} were found in '${contentType.title}' content type`));
-      log(info(`Sending ${contentType.title} content type entries for publish`));
+      debug(`Sending ${contentType.title} content type entries for publish`);
       // TODO: Important
       return self.publishEntries(entries, contentType, inputs.language, cb);
     });
@@ -351,7 +351,7 @@ Publish.prototype.content_types = function(callback) {
           });
         }
       }
-      log(info('Sending content types to load and publish entries'));
+      debug('Sending content types to load and publish entries');
       return self.loadEntries(content_types_bucket, callback);
     }
     return callback(null, null);

lib/request.js

@@ -53,9 +53,9 @@ var makeCall = module.exports = function(req, cb, RETRY) {
     } else if (RETRY > MAX_RETRY_LIMIT) {
       return cb(new Error('Max retry limit exceeded!'));
     }
-    log(info(`${req.method.toUpperCase()}: ${req.uri || req.url}`));
     return request(req, function(err, response, body) {
       if (err) {
+        log(error(err));
         return cb(err);
       }
       var timeDelay;
@@ -72,7 +72,7 @@ var makeCall = module.exports = function(req, cb, RETRY) {
       } else if (response.statusCode >= 500) {
         // retry, with delay
         timeDelay = Math.pow(Math.SQRT2, RETRY) * 100;
-        log(warning(`Recevied ${response.statusCode} status\nBody ${JSON.stringify(body)}`));
+        log(warning(`SERVER ERROR\nRecevied ${response.statusCode} status from Contentstack!\nBody ${JSON.stringify(body)}`));
         log(warning(`Retrying ${req.uri || req.url} with ${timeDelay} sec delay`));
         RETRY++;
         return setTimeout(function (req, cb, RETRY) {

lib/sync.js

@@ -55,7 +55,7 @@ function Sync(args) {
   // initalise the Synchronize command
   this.initialise(args, function (err) {
     if (err) {
-      log('Content sync failed with errors');
+      log(error('Content sync failed with errors'));
       log(error(err.message || JSON.stringify(err)));
       process.exit(1);
     }
@@ -66,7 +66,6 @@ function Sync(args) {
     if (self.q.length > 0) {
       var entryData = self.q.shift();
       self.sync.start(entryData);
-      log(info(`\nRequest details\n${JSON.stringify(entryData.message.body)}`));
     } else {
       inProgress = false;
       log(success('Cotentnstack \'SYNC\' completed successfully!!'));
@@ -236,7 +235,7 @@ Sync.prototype.loadEntries = function(contentTypes, finalCallback) {
     };
   }
   return async.eachLimit(contentTypes, 1, function (contentType, cb) {
-    return utility.getEntries(contentType, self.inputs.language, query, ['title', 'publish_details', '_version'], self.inputs.environment.name, function(error, entries) {
+    return utility.getEntries(contentType, self.inputs.language, query, ['title', 'publish_details', '_version', 'locale'], self.inputs.environment.name, function(error, entries) {
       if (error) {
         return cb(error);
       } else if (entries.length === 0) {
@@ -305,7 +304,7 @@ Sync.prototype.parseEntries = function(entries, contentType, fn) {
               entry: {
                 title: entry.title || entry.uid,
                 // TODO: clarify/confirm
-                locale: entry.locale || 'en-us',
+                locale: entry.locale || self.inputs.language || 'en-us',
                 version: entry.version || entry._version,
                 entry_uid: entry.uid
               },
@@ -323,10 +322,9 @@ Sync.prototype.parseEntries = function(entries, contentType, fn) {
 
     if (!inProgress) {
       var entryData = self.q.shift();
-      log(success(`Started content sync for ${contentType} entries`));
+      debug(`Started content sync for ${contentType} entries`);
       self.sync.start(entryData);
       inProgress = true;
-      log(info(`\nRequest details:\n${JSON.stringify(entryData.message.body)}`));
     }
     return fn(null, null);
   } catch (e) {
@@ -408,10 +406,9 @@ Sync.prototype.parseAssets = function(assets, finalCallback) {
 
   if (!inProgress && self.q.length) {
     var assetData = self.q.shift();
-    log(info('Started content sync for assets'));
+    debug('Started content sync for assets');
     self.sync.start(assetData);
     inProgress = true;
-    log(info(`\nRequest details:\n${JSON.stringify(assetData.message.body)}`));
   }
   return finalCallback(null, null);
 };
@@ -427,7 +424,7 @@ Sync.prototype.assets = function(callback) {
     if (error) {
       return callback(error);
     } else if (assets.length === 0) {
-      log(warning('No assets were found in the specified environment/stack'));
+      debug('No assets were found in the specified environment/stack');
       return callback(null, null);
     }
     log(info(`${assets.length} assets were retrieved`));