From d30385b49e181051d03c4130e360bc0f37606068 Mon Sep 17 00:00:00 2001
From: vjrj <vjrj@ourproject.org>
Date: Mon, 21 May 2018 17:42:37 +0200
Subject: [PATCH] Disable raven when not configured

---
 imports/startup/client/ravenLogger.js |  6 +++---
 imports/startup/server/ravenLogger.js | 10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/imports/startup/client/ravenLogger.js b/imports/startup/client/ravenLogger.js
index adbe66f..d7fc16e 100644
--- a/imports/startup/client/ravenLogger.js
+++ b/imports/startup/client/ravenLogger.js
@@ -2,11 +2,11 @@ import RavenLogger from 'meteor/flowkey:raven';
 import { Meteor } from 'meteor/meteor';
 
 const ravenOptions = {};
-
-const enabled = true && !Meteor.isDevelopment;
+const publicDSN = Meteor.settings.public.sentryPublicDSN;
+const enabled = !Meteor.isDevelopment && publicDSN;
 
 const ravenLogger = enabled ? new RavenLogger({
-  publicDSN: Meteor.settings.public.sentryPublicDSN, // will be used on the client
+  publicDSN, // will be used on the client
   shouldCatchConsoleError: true, // default
   trackUser: true // default
 }, ravenOptions) : { log: (error) => { console.log(error); } };
diff --git a/imports/startup/server/ravenLogger.js b/imports/startup/server/ravenLogger.js
index 868132a..e6bd2e9 100644
--- a/imports/startup/server/ravenLogger.js
+++ b/imports/startup/server/ravenLogger.js
@@ -2,12 +2,14 @@ import RavenLogger from 'meteor/flowkey:raven';
 import { Meteor } from 'meteor/meteor';
 
 const ravenOptions = {};
+const publicDSN = Meteor.settings.public.sentryPublicDSN;
+const privateDSN = Meteor.settings.sentryPrivateDSN;
 
-const ravenLogger = new RavenLogger({
-  publicDSN: Meteor.settings.public.sentryPublicDSN,
-  privateDSN: Meteor.settings.sentryPrivateDSN,
+const ravenLogger = publicDSN && privateDSN ? new RavenLogger({
+  publicDSN,
+  privateDSN,
   shouldCatchConsoleError: true, // default true
   trackUser: true // default false
-}, ravenOptions);
+}, ravenOptions) : { log: (error) => { console.log(error); } };
 
 export default ravenLogger;