Fix exception handler config to use ignore

googleapis · Apr 19, 2016 · 77f1c19 · AdriVanHoudt · Apr 19, 2016 · matthewloring
1 parent 751807a
commit 77f1c19
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/trace-agent.js b/lib/trace-agent.js
@@ -43,7 +43,8 @@ function TraceAgent(config, logger) {
 
   this.policy = tracingPolicy.createTracePolicy(config);
 
-  if (config.onUncaughtException !== 'disregard') {
+  console.log(config.onUncaughtException);
+  if (config.onUncaughtException !== 'ignore') {
     this.unhandledException = function() {
       traceAgent.traceWriter.flushBuffer_(traceAgent.config_.projectId);
       if (config.onUncaughtException === 'flushAndExit') {
@@ -67,7 +68,7 @@ TraceAgent.prototype.stop = function() {
   this.traceWriter.stop();
   this.namespace = null;
   traceAgent = null;
-  if (this.config_.onUncaughtException !== 'disregard') {
+  if (this.config_.onUncaughtException !== 'ignore') {
     process.removeListener('uncaughtException', this.unhandledException);
   }
   this.logger.info('trace agent deactivated');

diff --git a/test/standalone/test-index.js b/test/standalone/test-index.js
@@ -55,6 +55,13 @@ describe('index.js', function() {
     wrapTest(require('module'), '_load');
   });
 
+  it('should not attach exception handler with ignore option', function() {
+    agent.start();
+    // Mocha attaches 1 exception handler
+    assert.equal(process.listeners('uncaughtException').length, 1);
+    agent.stop();
+  });
+
   it('should wrap/unwrap http on start/stop', function() {
     agent.start(); // agent needs to be started before the first require.
     var http = require('http');