diff --git a/imports/api/FalsePositives/server/publications.js b/imports/api/FalsePositives/server/publications.js index 66e26f3..a79ae1a 100644 --- a/imports/api/FalsePositives/server/publications.js +++ b/imports/api/FalsePositives/server/publications.js @@ -5,7 +5,8 @@ import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { NumberBetween } from '/imports/modules/server/other-checks'; -import L from 'leaflet-headless'; +import '/imports/startup/server/leaflet-workaround.js'; +import L from 'leaflet'; import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify'; import Industries from '/imports/api/Industries/Industries'; import FalsePositives from '../FalsePositives'; diff --git a/imports/startup/server/index.js b/imports/startup/server/index.js index dd4f913..7f84dde 100644 --- a/imports/startup/server/index.js +++ b/imports/startup/server/index.js @@ -17,5 +17,4 @@ import './prerender'; import './feedback'; import './cron'; import './isMaster'; -import './segfaults'; import './rest'; diff --git a/imports/startup/server/leaflet-workaround.js b/imports/startup/server/leaflet-workaround.js new file mode 100644 index 0000000..740aa3b --- /dev/null +++ b/imports/startup/server/leaflet-workaround.js @@ -0,0 +1,19 @@ +// imports/startup/server/leaflet-workaround.js +global.window = { + screen: { + deviceXDPI: 1, + logicalXDPI: 1 + } +}; +global.document = { + documentElement: { + style: {} + }, + createElement: () => { + return {}; + } +}; +global.navigator = { + userAgent: 'foo', + platform: 'bar' +}; diff --git a/imports/startup/server/segfaults.js b/imports/startup/server/segfaults.js deleted file mode 100644 index b976f0b..0000000 --- a/imports/startup/server/segfaults.js +++ /dev/null @@ -1,25 +0,0 @@ -import SegfaultHandler from 'segfault-handler'; -import moment from 'moment'; -// import ravenLogger from './ravenLogger'; - -// https://github.com/ddopson/node-segfault-handler - -const dateFileFormat = moment().format('YYYYMMDD_HH:mm:ss'); - -SegfaultHandler.registerHandler(`/var/tmp/tcef-stacktrace-${dateFileFormat}.log`); - - -// This callaback does not work: -// https://github.com/ddopson/node-segfault-handler/issues/49 - -/* SegfaultHandler.registerHandler('/var/tmp/tcef-crash.log', (signal, address, stack) => { - * // Do what you want with the signal, address, or stack (array) - * // This callback will execute before the signal is forwarded on. - * ravenLogger.log(stack, signal); - * }); */ - -// Only uncomment for segv tests -// SegfaultHandler.causeSegfault(); - -// Or this for normal error (should go to raven in configured) -// throw new Error('This is just a test of error in server'); diff --git a/imports/startup/server/subsUnion.js b/imports/startup/server/subsUnion.js index 390a6ee..2643359 100644 --- a/imports/startup/server/subsUnion.js +++ b/imports/startup/server/subsUnion.js @@ -4,7 +4,8 @@ import { Meteor } from 'meteor/meteor'; import Subscriptions from '/imports/api/Subscriptions/Subscriptions'; import SiteSettings from '/imports/api/SiteSettings/SiteSettings'; import Perlin from 'loms.perlin'; -import L from 'leaflet-headless'; +import './leaflet-workaround'; +import L from 'leaflet'; import calcUnion from '/imports/ui/components/Maps/SubsUnion/Unify'; import { isMailServerMaster } from '/imports/startup/server/email';