Merge pull request #466 from rollbar/fix-global-config

Fix global config
rollbar · Oct 17, 2017 · a3cdf8d · a3cdf8d
2 parents 0af1bb8 + 2d40b94
commit a3cdf8d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/examples/universal-browser/server.js b/examples/universal-browser/server.js
@@ -9,7 +9,11 @@ const app = express();
 
 app.use(express.static(path.join(__dirname)));
 app.get('/rollbar.js', function response(req, res) {
-  res.sendFile(path.join(__dirname, '../../dist/rollbar.umd.js'))
+  var t = (req.query.t || 0.01) * 100;
+  console.log("Waiting: ", t, "ms");
+  setTimeout(function() {
+    res.sendFile(path.join(__dirname, '../../dist/rollbar.umd.js'))
+  }, t);
 });
 
 app.get('/test', function response(req, res) {

diff --git a/src/rateLimiter.js b/src/rateLimiter.js
@@ -83,7 +83,7 @@ RateLimiter.prototype.setPlatformOptions = function(platform, options) {
 /* Helpers */
 
 function checkRate(item, limit, counter) {
-  return !item.ignoreRateLimit && limit >= 1 && counter >= limit;
+  return !item.ignoreRateLimit && limit >= 1 && counter > limit;
 }
 
 function shouldSendValue(platform, options, error, shouldSend, globalRateLimit) {

diff --git a/src/rollbar.js b/src/rollbar.js
@@ -14,6 +14,7 @@ var _ = require('./utility');
 function Rollbar(options, api, logger, platform) {
   this.options = _.extend(true, {}, options);
   this.logger = logger;
+  Rollbar.rateLimiter.configureGlobal(this.options);
   Rollbar.rateLimiter.setPlatformOptions(platform, this.options);
   this.queue = new Queue(Rollbar.rateLimiter, api, logger, this.options);
   this.notifier = new Notifier(this.queue, this.options);
@@ -42,6 +43,7 @@ Rollbar.prototype.configure = function(options, payloadData) {
     payload = {payload: payloadData};
   }
   this.options = _.extend(true, {}, oldOptions, options, payload);
+  this.global(this.options);
   return this;
 };