Refactor [Client|Server]RollbarLogger to work with notifier API changes

wework · Nov 7, 2017 · dd44c1c · dd44c1c
1 parent 9ca7386
commit dd44c1c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/rollup.config.js b/rollup.config.js
@@ -36,7 +36,6 @@ export default {
     'bunyan',
     'bunyan-format',
     'hide-secrets',
-    'lodash/isError',
     'lodash/isFunction',
     'lodash/isObject',
     'lodash/mapValues',

diff --git a/src/util/client/rollbarLogger.js b/src/util/client/rollbarLogger.js
@@ -1,5 +1,7 @@
 import omit from 'lodash/omit';
 import get from 'lodash/get';
+import isFunction from 'lodash/isFunction';
+
 import { bunyanLevelToRollbarLevelName } from '../common/rollbar';
 
 // Rollbar script exposes this global immediately, whether or not its already initialized
@@ -43,6 +45,11 @@ ClientRollbarLogger.prototype.write = function (data = {}) {
   const rollbarLevelName = bunyanLevelToRollbarLevelName(data.level);
   const scopeData = omit(data, ['req', 'level']);
 
-  // https://rollbar.com/docs/notifier/rollbar.js/#usage
-  global.Rollbar.scope(scopeData)[rollbarLevelName](data.msg, data.err);
+  // https://rollbar.com/docs/notifier/rollbar.js/#rollbarlog
+  const logFn = global.Rollbar[rollbarLevelName];
+  if (isFunction(logFn)) {
+    logFn(data.msg, data.err, scopeData);
+  } else {
+    global.Rollbar.error(data.msg, data.err, scopeData);
+  }
 };
diff --git a/src/util/server/rollbarLogger.js b/src/util/server/rollbarLogger.js
@@ -1,6 +1,5 @@
 import Rollbar from 'rollbar';
 import omit from 'lodash/omit';
-import isError from 'lodash/isError';
 import isFunction from 'lodash/isFunction';
 import { bunyanLevelToRollbarLevelName } from '../common/rollbar';
 
@@ -37,20 +36,12 @@ ServerRollbarLogger.prototype.write = function (data = {}) {
   const scopeData = omit(data, ['req', 'level']);
   const payload = Object.assign({ level: rollbarLevelName }, scopeData);
 
+  // https://rollbar.com/docs/notifier/rollbar.js/#rollbarlog-1
   const logFn = Rollbar[rollbarLevelName];
 
-  if (data.err && isError(data.err)) {
-    if (isFunction(logFn)) {
-      logFn(data.err, data.req, payload);
-    } else {
-      Rollbar.error(data.err, data.req, payload);
-    }
+  if (isFunction(logFn)) {
+    logFn(data.msg, data.err, data.req, payload);
   } else {
-    // eslint-disable-next-line no-lonely-if
-    if (isFunction(logFn)) {
-      logFn(data.msg, data.req, payload);
-    } else {
-      Rollbar.log(data.msg, data.req, payload);
-    }
+    Rollbar.error(data.msg, data.err, data.req, payload);
   }
 };