Improved logs (#44)

* new logs

* more changes

* error fields

* holly molly

Author: turtledreams

lib/countly-common.js

@@ -209,15 +209,23 @@ var cc = {
     isResponseValid: function isResponseValid(statusCode, str) {
         // status code and response format check
         if (!(statusCode >= 200 && statusCode < 300)) {
+            this.log(this.logLevelEnums.ERROR, `isResponseValid, The server status code is not within the expected range: [${statusCode}]`);
             return false;
         }
 
         // Try to parse JSON
         try {
-            return !!JSON.parse(str).result;
+            var response = JSON.parse(str);
+            if (response.result) {
+                // if the 'result' field exists, we return 'true'
+                return true;
+            }
+            // result field was not there
+            this.log(this.logLevelEnums.ERROR, `isResponseValid, The server response has no 'result' field`);
+            return false;
         }
         catch (e) {
-            this.log("Http response is in the wrong format.", e);
+            this.log(this.logLevelEnums.ERROR, `isResponseValid, Http response is in the wrong format: [${e}]`);
             return false;
         }
     },

lib/countly.js

@@ -180,22 +180,21 @@ Countly.Bulk = Bulk;
                 }
             }
             catch (ex) {
-                // problem creating dir
-                // eslint-disable-next-line no-console
-                console.log(ex.stack);
+                // problem creating data dir
+                cc.log(cc.logLevelEnums.ERROR, `init, Failed to create the data directory:${ex}`);
             }
             // clear stored device ID if flag is set
             if (conf.clear_stored_device_id) {
-                cc.log(cc.logLevelEnums.WARNING, "Erasing stored ID");
+                cc.log(cc.logLevelEnums.WARNING, "init, Erasing stored ID");
                 storeSet("cly_id", null);
                 storeSet("cly_id_type", null);
             }
 
             if (Countly.url === "") {
-                cc.log(cc.logLevelEnums.ERROR, "Please provide server URL");
+                cc.log(cc.logLevelEnums.ERROR, "init, Please provide server URL");
             }
             else {
-                cc.log(cc.logLevelEnums.INFO, "Countly initialized");
+                cc.log(cc.logLevelEnums.INFO, "init, Countly initialized");
                 if (cluster.isMaster) {
                     // fetch stored ID and ID type
                     var storedId = storeGet("cly_id", null);
@@ -1443,7 +1442,7 @@ Countly.Bulk = Bulk;
                 if (err) {
                     requestQueue.unshift(res);
                     failTimeout = cc.getTimestamp() + failTimeoutAmount;
-                    cc.log(cc.logLevelEnums.ERROR, "makeRequest, Encountered a problem while making the request.");
+                    cc.log(cc.logLevelEnums.ERROR, `makeRequest, Encountered a problem while making the request: [${err}]`);
                 }
                 storeSet("cly_queue", requestQueue);
                 readyToProcess = true;
@@ -1607,6 +1606,7 @@ Countly.Bulk = Bulk;
                     str += chunk;
                 });
                 res.on("end", () => {
+                    cc.log(cc.logLevelEnums.DEBUG, `makeRequest, Response status code: [${res.statusCode}], response: [${str}]`);
                     // checks result field, JSON format and status code 
                     if (cc.isResponseValid(res.statusCode, str)) {
                         callback(false, params, str);
@@ -1720,8 +1720,7 @@ Countly.Bulk = Bulk;
         }
         catch (ex) {
             // problem parsing, corrupted file?
-            // eslint-disable-next-line no-console
-            console.log(ex.stack);
+            cc.log(cc.logLevelEnums.ERROR, `readFile, Failed to parse the file: [${ex}]`);
             // backup corrupted file data
             fs.writeFile(path.resolve(__dirname, `${Countly.storage_path}__${key}.${cc.getTimestamp()}${Math.random()}.json`), data, () => {});
             // start with new clean object
@@ -1743,8 +1742,7 @@ Countly.Bulk = Bulk;
             }
             catch (ex) {
                 // tried to save whats possible
-                // eslint-disable-next-line no-console
-                console.log(ex.stack);
+                cc.log(cc.logLevelEnums.ERROR, `forceStore, Saving files failed: [${ex}]`);
             }
         }
     };
@@ -1764,8 +1762,7 @@ Countly.Bulk = Bulk;
         var dir = path.resolve(__dirname, `${Countly.storage_path}__${key}.json`);
         fs.writeFile(dir, JSON.stringify(ob), (err) => {
             if (err) {
-                // eslint-disable-next-line no-console
-                console.log(err);
+                cc.log(cc.logLevelEnums.ERROR, `writeFile, Writing files failed: [${err}]`);
             }
             if (typeof callback === "function") {
                 callback(err);