From 6b20b67ee46eff83abe4052116b1231500badc34 Mon Sep 17 00:00:00 2001 From: Erik Ziegler Date: Wed, 4 Jul 2018 14:39:14 +0200 Subject: [PATCH] fix(server options) Prevent issues when servers are defined without logging options (closes #74) --- .../ohif-dicom-services/server/DICOMWeb/getBulkData.js | 8 ++++---- Packages/ohif-dicom-services/server/DICOMWeb/getJSON.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Packages/ohif-dicom-services/server/DICOMWeb/getBulkData.js b/Packages/ohif-dicom-services/server/DICOMWeb/getBulkData.js index c973e3c07..808fad3c4 100644 --- a/Packages/ohif-dicom-services/server/DICOMWeb/getBulkData.js +++ b/Packages/ohif-dicom-services/server/DICOMWeb/getBulkData.js @@ -203,21 +203,21 @@ const makeRequestSync = Meteor.wrapAsync(makeRequest); // TODO: Unify this stuff with the getJSON code DICOMWeb.getBulkData = function(geturl, options) { - if (options.logRequests) { + if (options && options.logRequests) { OHIF.log.info(geturl); } - if (options.logTiming) { + if (options && options.logTiming) { console.time(geturl); } var result = makeRequestSync(geturl, options); - if (options.logTiming) { + if (options && options.logTiming) { console.timeEnd(geturl); } - if (options.logResponses) { + if (options && options.logResponses) { OHIF.log.info(result); } diff --git a/Packages/ohif-dicom-services/server/DICOMWeb/getJSON.js b/Packages/ohif-dicom-services/server/DICOMWeb/getJSON.js index 691cdf093..d520048bd 100644 --- a/Packages/ohif-dicom-services/server/DICOMWeb/getJSON.js +++ b/Packages/ohif-dicom-services/server/DICOMWeb/getJSON.js @@ -88,21 +88,21 @@ function makeRequest(geturl, options, callback) { const makeRequestSync = Meteor.wrapAsync(makeRequest); DICOMWeb.getJSON = function(geturl, options) { - if (options.logRequests) { + if (options && options.logRequests) { OHIF.log.info(geturl); } - if (options.logTiming) { + if (options && options.logTiming) { console.time(geturl); } const result = makeRequestSync(geturl, options); - if (options.logTiming) { + if (options && options.logTiming) { console.timeEnd(geturl); } - if (options.logResponses) { + if (options && options.logResponses) { OHIF.log.info(result); }