console log levels; disabled in --production

clinical-meteor · Jan 21, 2023 · 4b716b1 · 4b716b1
1 parent 69b98de
commit 4b716b1
Show file tree

Hide file tree

Showing 38 changed files with 478 additions and 169 deletions.
diff --git a/app/Logger.js b/app/Logger.js
@@ -6,31 +6,31 @@ import { Meteor } from 'meteor/meteor';
 import "setimmediate";
 
 
-  // some functions that do log level filtering
-  const LEVEL = Symbol.for('level');
-  function filterOnly(level) {
-    return format(function (info) {
-      if (info[LEVEL] === level) {
-        return info;
-      }
-    })();
-  }
+// some functions that do log level filtering
+const LEVEL = Symbol.for('level');
+function filterOnly(level) {
+  return format(function (info) {
+    if (info[LEVEL] === level) {
+      return info;
+    }
+  })();
+}
 
-  function hideDataLogLevel() {
-    return format(function (info) {
-      if (info[LEVEL] !== 'data') {
-        return info;
-      }
-    })();
-  }
+function hideDataLogLevel() {
+  return format(function (info) {
+    if (info[LEVEL] !== 'data') {
+      return info;
+    }
+  })();
+}
 
-  function onlyDisplayDataLogLevel() {
-    return format(function (info) {
-      if (info[LEVEL] === 'data') {
-        return info;
-      }
-    })();
-  }
+function onlyDisplayDataLogLevel() {
+  return format(function (info) {
+    if (info[LEVEL] === 'data') {
+      return info;
+    }
+  })();
+}
 
 
 // lets create a global logger
@@ -89,7 +89,7 @@ addColors({
 });
 
 // what is the logging threshold set in the Meteor.settings file?
-logger.verbose('Setting the logging threshold to: ' + get(Meteor, 'settings.public.loggingThreshold'))
+console.info('Setting the logging threshold to: ' + get(Meteor, 'settings.public.loggingThreshold'))
 
 
 // introspection for the win
@@ -111,4 +111,126 @@ if(Meteor.isClient){
   window.logger = logger;
 }
 
-export default logger;
+
+export function log() { 
+  console.log('biz')
+
+  /* jshint -W021 */
+  //if(typeof window !== "undefined"){
+
+    // let log;
+    if (window.console) {
+
+      // Only run on the first time through - reset this function to the appropriate console.log helper
+      if (Function.prototype.bind) {
+        log = Function.prototype.bind.call(console.log, console);
+      } else {
+        log = function() { Function.prototype.apply.call(console.log, console, arguments); };
+      }
+
+      // console.info('log.log', log);
+      console.log('log.arguments[0]', arguments[0]);
+      log.apply(this, arguments);
+    }
+  //}
+}
+
+
+//Then redefine the old console
+if(typeof window === "object"){
+  window.console = console;
+  window.log = log;
+}
+
+
+export const message = {
+  log: function(text){
+    if(['everything'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      console.log('message.log', log)
+      console.log('log.arguments[0]', arguments[0])
+    }
+    if(['everything', 'debug', 'info', 'warn', 'verbose'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      if (Function.prototype.bind) {
+        log = Function.prototype.bind.call(console.log, console);
+      }
+      else {
+        log = function() { 
+          Function.prototype.apply.call(console.log, console, arguments);
+        };
+      }
+      log.apply(this, arguments);
+    }
+    // Your code
+  },
+  info: function (text) {
+    if(['everything'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      console.log('info.arguments[0]', arguments[0])
+    }
+    if(['everything', 'debug', 'info', 'warn', 'verbose'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      if (Function.prototype.bind) {
+        log = Function.prototype.bind.call(console.log, console);
+      }
+      else {
+        log = function() { 
+          Function.prototype.apply.call(console.log, console, arguments);
+        };
+      }
+      log.apply(this, arguments);
+    }
+  },
+  debug: function (text) {
+    if(['everything'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      console.log('debug.arguments[0]', arguments[0])
+    }
+    if(['everything', 'debug', 'info', 'warn', 'verbose'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      if (Function.prototype.bind) {
+        log = Function.prototype.bind.call(console.log, console);
+      }
+      else {
+        log = function() { 
+          Function.prototype.apply.call(console.log, console, arguments);
+        };
+      }
+      log.apply(this, arguments);
+    }
+  },
+  warn: function (text) {
+    if(['everything'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      console.log('warn.arguments[0]', arguments[0])
+    }
+    if(['everything', 'debug', 'info', 'warn', 'verbose'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      if (Function.prototype.bind) {
+        log = Function.prototype.bind.call(console.log, console);
+      }
+      else {
+        log = function() { 
+          Function.prototype.apply.call(console.log, console, arguments);
+        };
+      }
+      log.apply(this, arguments);
+    }
+  },
+  error: function (text) {
+    if(['everything'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      console.error('error.arguments[0]', arguments[0])
+    }
+    if(['everything', 'debug', 'info', 'warn', 'verbose'].includes(get(Meteor, 'settings.public.loggingThreshold'))){
+      if (Function.prototype.bind) {
+        log = Function.prototype.bind.call(console.log, console);
+      }
+      else {
+        log = function() { 
+          Function.prototype.apply.call(console.log, console, arguments);
+        };
+      }
+      log.apply(this, arguments);
+    }
+  }
+}
+// //Then redefine the old console
+// if(typeof window === "object"){
+//   window.console = message;
+// }
+
+
+export default { logger, log, message };
diff --git a/app/WebsocketSubscriptions.js b/app/WebsocketSubscriptions.js
@@ -10,6 +10,7 @@ import { BaseSchema, DomainResourceSchema } from 'meteor/clinical:hl7-resource-d
 import { InboundRequests, UdapCertificates, OAuthClients } from 'meteor/clinical:hl7-fhir-data-infrastructure';
 
 import base64url from 'base64-url';
+import { message } from './Logger';
 
 import { 
     FhirUtilities, 
@@ -173,7 +174,7 @@ function setCollectionDefaultQuery(collectionName, subscriptionRecord){
     if(get(subscriptionRecord, 'criteria')){
         let criteriaString = get(subscriptionRecord, 'criteria');
         let criteriaJson = JSON.parse(criteriaString);
-        console.log('criteriaJson', criteriaJson);
+        message.trace('criteriaJson', criteriaJson);
 
         if(typeof criteriaJson === "object"){
             Object.assign(defaultQuery, criteriaJson);
@@ -190,7 +191,7 @@ Meteor.startup(function(){
 
         // should we iterate through Meteor.settings.private.fhir.rest here?
         Object.keys(Collections).forEach(function(collectionName){
-            console.log("Autosubscribing to the " + collectionName + " data channel.")
+            console.info("Autosubscribing to the " + collectionName + " data channel.")
             Meteor.subscribe(collectionName);    
         });
     }
@@ -200,7 +201,7 @@ Meteor.startup(function(){
         // subscribe to a DDS pubsub based on the FHIR Subscription record
         console.log("Subscriptions count: " + Subscriptions.find().count())
         Subscriptions.find().forEach(function(subscriptionRecord){
-            console.log("Subscribing to " + collectionName + " DDP cursor.");
+            console.info("Subscribing to " + collectionName + " DDP cursor.");
             Meteor.subscribe(get(subscriptionRecord, 'channel.endpoint'));
         });
     }

diff --git a/app/accounts/Accounts.js b/app/accounts/Accounts.js
@@ -10,7 +10,7 @@ import { Session } from 'meteor/session';
 import jwt from 'jsonwebtoken';
 
 let apiHostFromSettings = get(Meteor, 'settings.public.interfaces.accountsServer.host') + ":" + get(Meteor, 'settings.public.interfaces.accountsServer.port');
-console.log('Accounts.apiHost', apiHostFromSettings);
+// console.log('Accounts.apiHost', apiHostFromSettings);
 
 const accountsRest = new RestClient({
   apiHost: apiHostFromSettings,
@@ -31,10 +31,10 @@ Meteor.startup(async function(){
   try {
     if(typeof(Storage) !== "undefined"){
       let tokens = await accountsClient.getTokens();
-      console.log('tokens', tokens)
+      // console.log('tokens', tokens)
       if(get(tokens, 'accessToken')){
         let decoded = jwt.decode(tokens.accessToken, {complete: true});
-        console.log('decoded', decoded)
+        // console.log('decoded', decoded)
         Session.set('accountsAccessToken', get(tokens, 'accessToken'))
         Session.set('accountsRefreshToken', get(tokens, 'refreshToken'))
       }          

diff --git a/app/accounts/AuthContext.jsx b/app/accounts/AuthContext.jsx
@@ -70,13 +70,13 @@ async function fetchUser(setAuthContextState){
 };
 
 async function loginWithService(service, credentials, setError, setSuccess){
-  console.log('AuthContext.loginWithService()', service, credentials);
+  // console.log('AuthContext.loginWithService()', service, credentials);
 
   let loginResponse;
 
   try {
     loginResponse = await accountsClient.loginWithService(service, credentials);
-    console.log('AuthContext.loginResponse', loginResponse)
+    // console.log('AuthContext.loginResponse', loginResponse)
 
     if(typeof setSuccess === "function"){
       setSuccess(loginResponse);
@@ -95,7 +95,7 @@ async function loginWithService(service, credentials, setError, setSuccess){
     }
 
     if (error instanceof AccountsJsError) {
-      console.log('error.message', error.message)
+      console.error('error.message', error.message)
 
       // You can access the error message via `error.message`
       // Eg: "Email already exists"
@@ -117,7 +117,7 @@ async function loginWithService(service, credentials, setError, setSuccess){
   }
 
   if(Meteor.isClient && loginResponse){
-    console.log('loginResponse', loginResponse);
+    // console.log('loginResponse', loginResponse);
     Session.set('currentUser', get(loginResponse, 'user'));
     Session.set('selectedPatientId', get(loginResponse, 'user.patientId'));
 

diff --git a/app/accounts/AuthContext.working.jsx b/app/accounts/AuthContext.working.jsx
@@ -27,14 +27,15 @@ async function fetchUser(setAuthContextState){
 };
 
 async function loginWithService(service, credentials){
-  console.log('AuthContext.loginWithService()', service, credentials);
+  // console.log('AuthContext.loginWithService()', service, credentials);
 
   await accountsClient.loginWithService(service, credentials);
   await fetchUser();
 };
 
 async function logout(){
-  console.log('AuthContext.logout()')
+  console.info('AuthContext.logout()')
+
   await accountsClient.logout();
   // setState({ loading: false, user: undefined });
 

diff --git a/app/accounts/Login.jsx b/app/accounts/Login.jsx
@@ -30,6 +30,8 @@ import { accountsClient } from './Accounts';
 import { get } from 'lodash';
 import jwt from 'jsonwebtoken';
 
+import { log, message } from '../Logger';
+
 const useStyles = makeStyles(theme => ({
   cardContent: {
     padding: theme.spacing(3),
@@ -68,7 +70,7 @@ const Login = function({ history }){
       password: '',
       code: ''
     },
-    validate: function(values){
+    validate: function(values){  
       const errors = {};
 
       if (!values.email) {
@@ -81,7 +83,7 @@ const Login = function({ history }){
     },
     onSubmit: async function(values, { setSubmitting }){
 
-      console.log('AccountsClient: Submiting username and password for authentication.')
+      console.log('AccountsClient: Submiting username and password for authentication.');
 
       try {
         await loginWithService('password', {
@@ -92,7 +94,7 @@ const Login = function({ history }){
           // code: values.code
         }, setError, async function setSuccess(result){
           if(result){
-            console.log('loginWithService.result', result)
+            // console.log('loginWithService.result', result)
 
             Session.set('sessionId', get(result, 'sessionId'));    
             // Session.set('sessionAccessToken', get(result, 'tokens.accessToken'));    
@@ -101,10 +103,10 @@ const Login = function({ history }){
             Session.set('lastUpdated', new Date());    
 
             let tokens = await accountsClient.getTokens();
-            console.log('tokens', tokens)
+            // console.log('tokens', tokens)
             if(get(tokens, 'accessToken')){
               let decoded = jwt.decode(tokens.accessToken, {complete: true});
-              console.log('decoded', decoded)
+              // console.log('decoded', decoded)
               Session.set('accountsAccessToken', get(tokens, 'accessToken'))
               Session.set('accountsRefreshToken', get(tokens, 'refreshToken'))
             }  

diff --git a/app/accounts/Logout.jsx b/app/accounts/Logout.jsx
@@ -33,6 +33,8 @@ import { Session } from 'meteor/session';
 import { Meteor } from 'meteor/meteor';
 
 import jwt from 'jsonwebtoken';
+import { log, message } from '../Logger';
+
 
 // import { AccountsClient } from '@accounts/client';
 // import { RestClient } from '@accounts/rest-client';
@@ -89,7 +91,7 @@ const Logout = function({ history }){
 
   let currentUser = useTracker(function(){
     return Session.get('currentUser');
-  }, [])
+  }, []);
 
   //-----------------------------------------------------------
   // Helper Functions
@@ -101,15 +103,16 @@ const Logout = function({ history }){
   }
 
   async function logoutUser(){
-    console.log('Logging out user session: ' + Session.get('accountsAccessToken'))
+    console.info('AccountsClient: Logging out user.')
+    console.debug('AccountsClient: User session: ' + Session.get('accountsAccessToken'))
 
 
     await accountsClient.logout();
     await accountsClient.clearTokens();
 
     Meteor.call('jsaccounts/validateLogout', Session.get('accountsAccessToken'));
 
-    console.log('accountsClient.getTokens()', await accountsClient.getTokens());
+    console.debug('AccountsClient: getTokens()', await accountsClient.getTokens());
 
     // close dialog
     Session.set('mainAppDialogOpen', false);