@agoric/cosmic-swingset 0.41.4-dev-121b677.0 → 0.41.4-dev-d2ea4b4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/cosmic-swingset",
-  "version": "0.41.4-dev-121b677.0+121b677",
+  "version": "0.41.4-dev-d2ea4b4.0+d2ea4b4",
   "description": "Agoric's Cosmos blockchain integration",
   "type": "module",
   "bin": {
@@ -22,17 +22,18 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-121b677.0+121b677",
-    "@agoric/builders": "0.1.1-dev-121b677.0+121b677",
-    "@agoric/cosmos": "0.34.2-dev-121b677.0+121b677",
-    "@agoric/deploy-script-support": "0.10.4-dev-121b677.0+121b677",
-    "@agoric/internal": "0.3.3-dev-121b677.0+121b677",
-    "@agoric/store": "0.9.3-dev-121b677.0+121b677",
-    "@agoric/swing-store": "0.9.2-dev-121b677.0+121b677",
-    "@agoric/swingset-vat": "0.32.3-dev-121b677.0+121b677",
-    "@agoric/telemetry": "0.6.3-dev-121b677.0+121b677",
-    "@agoric/vm-config": "0.1.1-dev-121b677.0+121b677",
+    "@agoric/assert": "0.6.1-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/builders": "0.1.1-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/cosmos": "0.34.2-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/deploy-script-support": "0.10.4-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/internal": "0.3.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/store": "0.9.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/swing-store": "0.9.2-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/swingset-vat": "0.32.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/telemetry": "0.6.3-dev-d2ea4b4.0+d2ea4b4",
+    "@agoric/vm-config": "0.1.1-dev-d2ea4b4.0+d2ea4b4",
     "@endo/bundle-source": "^3.0.2",
+    "@endo/env-options": "^1.1.0",
     "@endo/far": "^1.0.2",
     "@endo/import-bundle": "^1.0.2",
     "@endo/init": "^1.0.2",
@@ -69,5 +70,5 @@
   "typeCoverage": {
     "atLeast": 79.32
   },
-  "gitHead": "121b67747aaa842adff618c610dbb0835d88cc33"
+  "gitHead": "d2ea4b46b9efa61e97eec8711830d9fdd741ca55"
 }

package/src/anylogger-agoric.js

@@ -1,45 +1,55 @@
-/* global process */
+import {
+  getEnvironmentOptionsList,
+  getEnvironmentOption,
+} from '@endo/env-options';
 import anylogger from 'anylogger';
 
 // Turn on debugging output with DEBUG=agoric
 
-const { DEBUG: debugEnv = '' } = process.env;
-let debugging;
+const DEBUG_LIST = getEnvironmentOptionsList('DEBUG');
 
-const filterOutPrefixes = [];
-// Mute vat logging unless requested, for determinism.
-if (!debugEnv.includes('SwingSet:vat')) {
-  filterOutPrefixes.push('SwingSet:vat:');
-}
-// Mute liveSlots logging unless requested, for determinism.
-if (!debugEnv.includes('SwingSet:ls')) {
-  filterOutPrefixes.push('SwingSet:ls:');
-}
+const isVatLogNameColon = nameColon =>
+  ['SwingSet:ls:', 'SwingSet:vat:'].some(sel => nameColon.startsWith(sel));
 
-if (process.env.DEBUG === undefined) {
-  // DEBUG wasn't set, default to info level; quieter than normal.
-  debugging = 'info';
-} else if (debugEnv.includes('agoric')) {
-  // $DEBUG set and we're enabled; loudly verbose.
-  debugging = 'debug';
-} else {
-  // $DEBUG set but we're not enabled; slightly louder than normal.
-  debugging = 'log';
+// Turn on debugging output with DEBUG=agoric or DEBUG=agoric:${level}
+let selectedLevel =
+  DEBUG_LIST.length || getEnvironmentOption('DEBUG', 'unset') === 'unset'
+    ? 'log'
+    : 'info';
+for (const selector of DEBUG_LIST) {
+  const parts = selector.split(':');
+  if (parts[0] !== 'agoric') {
+    continue;
+  }
+  if (parts.length > 1) {
+    selectedLevel = parts[1];
+  } else {
+    selectedLevel = 'debug';
+  }
 }
-const defaultLevel = anylogger.levels[debugging];
+const selectedCode = anylogger.levels[selectedLevel];
+const globalCode = selectedCode === undefined ? -Infinity : selectedCode;
 
 const oldExt = anylogger.ext;
 anylogger.ext = (l, o) => {
   l = oldExt(l, o);
-  l.enabledFor = lvl => defaultLevel >= anylogger.levels[lvl];
+  l.enabledFor = lvl => globalCode >= anylogger.levels[lvl];
 
   const prefix = l.name.replace(/:/g, ': ');
-  const filteredOut = filterOutPrefixes.find(pfx => l.name.startsWith(pfx));
+
+  const nameColon = `${l.name}:`;
+  const logBelongsToVat = isVatLogNameColon(nameColon);
+
+  // If this is a vat log, then it is enabled by a selector in DEBUG_LIST.
+  const logMatchesSelector =
+    !logBelongsToVat ||
+    DEBUG_LIST.some(selector => {
+      const selectorColon = `${selector}:`;
+      return nameColon.startsWith(selectorColon);
+    });
+
   for (const [level, code] of Object.entries(anylogger.levels)) {
-    if (filteredOut || code > defaultLevel) {
-      // Disable printing.
-      l[level] = () => {};
-    } else {
+    if (logMatchesSelector && globalCode >= code) {
       // Enable the printing with a prefix.
       const doLog = l[level];
       if (doLog) {
@@ -51,6 +61,9 @@ anylogger.ext = (l, o) => {
       } else {
         l[level] = () => {};
       }
+    } else {
+      // Disable printing.
+      l[level] = () => {};
     }
   }
   return l;