(fix) Only use static middleware if env is passed appropriately

uzh-bf · Nov 26, 2017 · 2ddede3 · 2ddede3
1 parent d470db3
commit 2ddede3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/server.js b/server.js
@@ -59,10 +59,13 @@ app
       helmet({
         hsts: false,
       }),
-      // static file serving from public folder
-      express.static(join(__dirname, 'public')),
     ]
 
+    if (process.env.STATIC_PATH) {
+      // static file serving from public folder
+      express.static(process.env.STATIC_PATH, join(__dirname, 'public'))
+    }
+
     // activate morgan logging in production
     if (!dev) {
       middleware.push(morgan('combined'))

diff --git a/src/lib/initLogging.js b/src/lib/initLogging.js
@@ -5,7 +5,7 @@ export default function initLogging() {
   // restrict code execution for trackers to clientside
   if (typeof window !== 'undefined') {
     // embed logrocket if enabled
-    if (!logrocket && process.env.LOGROCKET) {
+    if (!logrocket && process.env.LOGROCKET && process.env.LOGROCKET !== '__LOGROCKET__') {
       const LogRocket = require('logrocket')
       const LogRocketReact = require('logrocket-react')
       LogRocket.init(process.env.LOGROCKET)
@@ -15,12 +15,12 @@ export default function initLogging() {
     }
 
     // embed sentry if enabled
-    if (!sentry && process.env.SENTRY) {
+    if (!sentry && process.env.SENTRY && process.env.SENTRY !== '__SENTRY__') {
       const Raven = require('raven-js')
 
       Raven.config(process.env.SENTRY).install()
 
-      if (process.env.LOGROCKET) {
+      if (process.env.LOGROCKET !== '__LOGROCKET__') {
         Raven.setDataCallback(data =>
           Object.assign({}, data, {
             extra: {