minor fixes

Author: alexk-blackops

lib/api.js

@@ -1,9 +1,11 @@
 var os      = require('os'),
     url     = require('url'),
     util    = require('util'),
+
     send    = require('./sender'),
     logger  = require('./logger'),
     CONFIG  = require('../config/config'),
+
     pkginfo = require('pkginfo')(module, 'name'),
 
     appname = module.exports.name, //name of the app from package.json
@@ -67,10 +69,10 @@ module.exports.methods = {
             throw new TypeError('Settings are not provided');
         }
 
-        if (setting.apiKey && typeof (settings.apiKey) === 'string') {
+        if (settings.apiKey && typeof (settings.apiKey) === 'string') {
             opt.headers['X-Stackify-Key'] = settings.apiKey;
             CONFIG.APPNAME = appname;
-            CONFIG.ENV = settings.env;
+            CONFIG.ENV = settings.env || null;
             send(opt, callback, fail);
         } else {
             throw new TypeError('You have to pass API key');

lib/exception.js

@@ -17,6 +17,10 @@ var qs      = require('querystring'),
             },
             fail_counter = 0,
 
+            cb = function () {
+                console.log('sent', util.inspect(logger.storage, {depth: null}));
+            }
+
             //retry the request if it failed
             fail = function () {
                 fail_counter += 1;
@@ -34,10 +38,10 @@ var qs      = require('querystring'),
         } else {
             console.log('not identified yet');
         }
-    },
+    };
 
-    // flag used for not catching the same exception twice (inside and outside of the createServer method) 
-    excCaught = false;
+// flag used for not catching the same exception twice (inside and outside of the createServer method) 
+module.exports.excCaught = excCaught = false;
 
 module.exports = {
     // Pure Node apps exception catching

lib/logger.js

@@ -1,8 +1,9 @@
-var api = require('./api'),
-    util = require('util'),
-    CONFIG = require('../config/config'),
+var util    = require('util'),
+    api     = require('./api'),
+    CONFIG  = require('../config/config'),
     helpers = require('./helpers'),
-    error = require('./error'),
+    error   = require('./error'),
+    exc     = require('./exception'),
 
     storage = [],
 
@@ -26,7 +27,7 @@ var api = require('./api'),
     // handler for sending logs
     sendLogs = function (length) {
         var self = this,
-            data = storage.slice(0, length),
+            data = storage.slice(0, length || CONFIG.MSG_LIMIT),
 
             /* if request is succesful remove messages from the queue, change the timeout for the next checkLogs call,
                switch the flag, send another batch (if there are enough messages in the queue)
@@ -133,7 +134,7 @@ module.exports.methods = {
 
         if ((level.toLowerCase() === 'error' && checkErrorLimitMessage(rec.Ex)) || level.toLowerCase() !== 'error') {
             storage.push(rec);
-            console.log('logged');
+            console.log('logged', storage.length);
 
             // remove the earliest message from the queue if message cap is exceeded    
             if (storage.length === CONFIG.MSG_CAP) {
@@ -155,7 +156,7 @@ module.exports.methods = {
         timeout = setTimeout(checkLogs, CONFIG.SCAN_TIMER);
 
         if (storage.length >= CONFIG.MSG_LIMIT) {
-            sendLogs();
+            sendLogs(exc.excCaught ? storage.length : null);
         }
     },
 

lib/sender.js

@@ -15,13 +15,10 @@ module.exports = function sender(options, cb, fail) {
         if (!error) {
             if (response.statusCode === 200) {
                 if (cb) {
-                    cb(body);
-                    console.log('success');
-                }
+                    cb(body);                }
             } else {
                 if (fail) {
                     fail();
-                    console.log('fail:', body);
                 }
             }
         } else {