Re-order catch clauses and actually output the suppressed error to co…

…nsole
Wedvich · Aug 23, 2018 · cb7f2d3 · cb7f2d3
1 parent a99c724
commit cb7f2d3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 45 deletions.
diff --git a/dist/structured-log-seq-sink.es6.js b/dist/structured-log-seq-sink.es6.js
@@ -43,9 +43,9 @@ function mapLogLevel(logLevel) {
 }
 
 function logSuppressedError(reason) {
-  // if (typeof console !== 'undefined' && console.warn) {
-  //   console.warn('Suppressed error when logging to Seq: ' + reason);
-  // }
+  if (typeof console !== 'undefined' && console.warn) {
+    console.warn('Suppressed error when logging to Seq: ' + reason);
+  }
 }
 
 var SeqSink = function () {
@@ -95,10 +95,10 @@ var SeqSink = function () {
         }
 
         var body = localStorage.getItem(storageKey);
-        requests[storageKey] = postToSeq(this.url, this.apiKey, this.compact, body).catch(function (reason) {
-          return _this.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason);
-        }).then(function () {
+        requests[storageKey] = postToSeq(this.url, this.apiKey, this.compact, body).then(function () {
           return localStorage.removeItem(k);
+        }).catch(function (reason) {
+          return _this.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason);
         });
       }
     }
@@ -170,16 +170,14 @@ var SeqSink = function () {
         localStorage.setItem(storageKey, body);
       }
 
-      return postToSeq(this.url, this.apiKey, this.compact, body, done).catch(function (reason) {
+      return postToSeq(this.url, this.apiKey, this.compact, body, done).then(function (response) {
+        return response.json();
+      }).then(function (json) {
+        return _this3.updateLogLevel(json);
+      }).then(function () {
+        if (storageKey) localStorage.removeItem(storageKey);
+      }).catch(function (reason) {
         return _this3.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason);
-      }).then(function (response) {
-        return response && response.json().then(function (json) {
-          return _this3.updateLogLevel(json);
-        }).then(function () {
-          if (storageKey) {
-            localStorage.removeItem(storageKey);
-          }
-        });
       });
     }
   }, {

diff --git a/dist/structured-log-seq-sink.js b/dist/structured-log-seq-sink.js
@@ -49,9 +49,9 @@
   }
 
   function logSuppressedError(reason) {
-    // if (typeof console !== 'undefined' && console.warn) {
-    //   console.warn('Suppressed error when logging to Seq: ' + reason);
-    // }
+    if (typeof console !== 'undefined' && console.warn) {
+      console.warn('Suppressed error when logging to Seq: ' + reason);
+    }
   }
 
   var SeqSink = function () {
@@ -101,10 +101,10 @@
           }
 
           var body = localStorage.getItem(storageKey);
-          requests[storageKey] = postToSeq(this.url, this.apiKey, this.compact, body).catch(function (reason) {
-            return _this.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason);
-          }).then(function () {
+          requests[storageKey] = postToSeq(this.url, this.apiKey, this.compact, body).then(function () {
             return localStorage.removeItem(k);
+          }).catch(function (reason) {
+            return _this.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason);
           });
         }
       }
@@ -176,16 +176,14 @@
           localStorage.setItem(storageKey, body);
         }
 
-        return postToSeq(this.url, this.apiKey, this.compact, body, done).catch(function (reason) {
+        return postToSeq(this.url, this.apiKey, this.compact, body, done).then(function (response) {
+          return response.json();
+        }).then(function (json) {
+          return _this3.updateLogLevel(json);
+        }).then(function () {
+          if (storageKey) localStorage.removeItem(storageKey);
+        }).catch(function (reason) {
           return _this3.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason);
-        }).then(function (response) {
-          return response && response.json().then(function (json) {
-            return _this3.updateLogLevel(json);
-          }).then(function () {
-            if (storageKey) {
-              localStorage.removeItem(storageKey);
-            }
-          });
         });
       }
     }, {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "structured-log-seq-sink",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A structured-log plugin that writes log events to Seq.",
   "main": "dist/structured-log-seq-sink.js",
   "jsnext:main": "dist/structured-log-seq-sink.es6.js",

diff --git a/src/index.js b/src/index.js
@@ -35,9 +35,9 @@ function mapLogLevel(logLevel) {
 }
 
 function logSuppressedError(reason) {
-  // if (typeof console !== 'undefined' && console.warn) {
-  //   console.warn('Suppressed error when logging to Seq: ' + reason);
-  // }
+  if (typeof console !== 'undefined' && console.warn) {
+    console.warn('Suppressed error when logging to Seq: ' + reason);
+  }
 }
 
 class SeqSink {
@@ -84,8 +84,8 @@ class SeqSink {
 
         const body = localStorage.getItem(storageKey);
         requests[storageKey] = postToSeq(this.url, this.apiKey, this.compact, body)
-          .catch(reason => this.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason))
-          .then(() => localStorage.removeItem(k));
+          .then(() => localStorage.removeItem(k))
+          .catch(reason => this.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason));
       }
     }
 
@@ -148,15 +148,10 @@ class SeqSink {
     }
 
     return postToSeq(this.url, this.apiKey, this.compact, body, done)
-      .catch(reason => this.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason))
-      .then(response => response && response.json()
-          .then(json => this.updateLogLevel(json))
-          .then(() => {
-            if (storageKey) {
-              localStorage.removeItem(storageKey);
-            }
-          })
-      );
+      .then(response => response.json())
+      .then(json => this.updateLogLevel(json))
+      .then(() => { if (storageKey) localStorage.removeItem(storageKey) })
+      .catch(reason => this.suppressErrors ? logSuppressedError(reason) : Promise.reject(reason));
   }
 
   updateLogLevel(response) {