editor: some refactoring & cleanup

[fnpeditor.git] / src / fnpjs / logging / handlers.js

diff --git a/src/fnpjs/logging/handlers.js b/src/fnpjs/logging/handlers.js
index 966af4e..5b14be6 100644 (file)
--- a/src/fnpjs/logging/handlers.js
+++ b/src/fnpjs/logging/handlers.js
@@ -4,23 +4,40 @@ define(function() {
 
 
 return {
 
 
 return {

-    raven: function(msg, level, data) {
+    console: function(record) {
+        /* global console */
+        var level = record.level,
+            method;
+        if(console) {
+            if(level === 'warning') {
+                level = 'warn';
+            }
+            method = (typeof console[level] === 'function') ? level : 'log';
+            console[method](record.message);
+        }
+    },
+    raven: function(record) {

         /* global window */
         if(!window.Raven) {
             return;
         }
 
         /* global window */
         if(!window.Raven) {
             return;
         }
 

-        var ravenData = {};
+        var ravenData = {
+            level: record.level,
+            logger: record.loggerName,
+            tags: {}
+        };

 
 

-        if(data.exception) {
-            window.Raven.captureException(data.exception);
-        } else {
-            Object.keys(data || {}).forEach(function(key) {
-                ravenData[key] = data[key];
+        Object.keys(record.data || {})
+            .filter(function(key) {return key !== 'exception';})
+            .forEach(function(key) {
+                ravenData.tags[key] = record.data[key];

             });
             });

-            ravenData.tags = ravenData.tags || {};
-            ravenData.tags.level = level;
-            window.Raven.captureMessage(msg, ravenData);
+
+        if(record.data && record.data.exception) {
+            window.Raven.captureException(record.data.exception, ravenData);
+        } else {
+            window.Raven.captureMessage(record.message, ravenData);

         }
     }
 };
         }
     }
 };