Merge pull request #347 from Microsoft/logging

Tweaking log messages

Author: lostintangent

CodePush.js

@@ -182,15 +182,23 @@ async function tryReportStatus(resumeListener) {
     const previousDeploymentKey = statusReport.previousDeploymentKey || config.deploymentKey;
     try {
       if (statusReport.appVersion) {
+        log(`Reporting binary update (${statusReport.appVersion})`);
+        
         const sdk = getPromisifiedSdk(requestFetchAdapter, config);
         await sdk.reportStatusDeploy(/* deployedPackage */ null, /* status */ null, previousLabelOrAppVersion, previousDeploymentKey);
       } else {
+        const label = statusReport.package.label;
+        if (statusReport.status === "DeploymentSucceeded") {
+          log(`Reporting CodePush update success (${label})`);
+        } else {
+          log(`Reporting CodePush update rollback (${label})`);
+        }
+      
         config.deploymentKey = statusReport.package.deploymentKey;
         const sdk = getPromisifiedSdk(requestFetchAdapter, config);
         await sdk.reportStatusDeploy(statusReport.package, statusReport.status, previousLabelOrAppVersion, previousDeploymentKey);
       }
-
-      log(`Reported status: ${JSON.stringify(statusReport)}`);
+      
       NativeCodePush.recordStatusReported(statusReport);
       resumeListener && AppState.removeEventListener("change", resumeListener);
     } catch (e) {

RestartManager.js

@@ -1,45 +1,46 @@
-let log = require('./logging');
-let NativeCodePush = require("react-native").NativeModules.CodePush;
+const log = require("./logging");
+const NativeCodePush = require("react-native").NativeModules.CodePush;
 
 const RestartManager = (() => {
     let _allowed = true;
     let _restartPending = false;
 
-    function restartApp(onlyIfUpdateIsPending = false) {
-        if (_allowed) {
-            NativeCodePush.restartApp(onlyIfUpdateIsPending);
-            log('restaes');
-        } else {
-            log("restart not allowed");
-            _restartPending = true;
-            return true;
-        }
-    }
-
     function allow() {
-        log("allow restart");
+        log("Re-allowing restarts");
         _allowed = true;
+        
         if (_restartPending) {
-            log("executing pending restart");
+            log("Executing pending restart");
             restartApp(true);
         }
     }
-
+    
+    function clearPendingRestart() {
+        _restartPending = false;
+    }
+    
     function disallow() {
-        log("disallow restart");
+        log("Disallowing restarts");
         _allowed = false;
     }
 
-    function clearPendingRestart() {
-        _restartPending = false;
+    function restartApp(onlyIfUpdateIsPending = false) {
+        if (_allowed) {
+            NativeCodePush.restartApp(onlyIfUpdateIsPending);
+            log("Restarting app");
+        } else {
+            log("Restart request queued until restarts are re-allowed");
+            _restartPending = true;
+            return true;
+        }
     }
 
     return {
         allow,
+        clearPendingRestart,        
         disallow,
-        restartApp,
-        clearPendingRestart
+        restartApp
     };
 })();
 
-module.exports = RestartManager;
+module.exports = RestartManager;