From 2cf5cd8ec66d1ee38f351be8b2e3c808afd554a9 Mon Sep 17 00:00:00 2001
From: Michael FIG <mfig@agoric.com>
Date: Wed, 18 Mar 2020 17:50:04 -0600
Subject: [PATCH] feat: default to silent unles `DEBUG=agoric`

---
 packages/agoric-cli/test/test-workflow.js    | 2 +-
 packages/cosmic-swingset/bin/ag-solo         | 2 ++
 packages/cosmic-swingset/lib/ag-chain-cosmos | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/agoric-cli/test/test-workflow.js b/packages/agoric-cli/test/test-workflow.js
index b32de688c1e..6b182108ba3 100644
--- a/packages/agoric-cli/test/test-workflow.js
+++ b/packages/agoric-cli/test/test-workflow.js
@@ -55,7 +55,7 @@ test('workflow', async t => {
         startP.cp.stdout.on('data', chunk => {
           // console.log('stdout:', chunk.toString());
           stdoutStr += chunk.toString();
-          if (stdoutStr.match(/^swingset running$/m)) {
+          if (stdoutStr.match(/(^|:\s+)swingset running$/m)) {
             successfulStart = true;
             startP.cp.kill('SIGINT');
           }
diff --git a/packages/cosmic-swingset/bin/ag-solo b/packages/cosmic-swingset/bin/ag-solo
index ccc230042da..6eed61b3181 100755
--- a/packages/cosmic-swingset/bin/ag-solo
+++ b/packages/cosmic-swingset/bin/ag-solo
@@ -3,6 +3,8 @@
 const process = require('process');
 const esmRequire = require('esm')(module);
 
+// Configure logs.
+esmRequire('../lib/anylogger-agoric.js');
 const solo = esmRequire('../lib/ag-solo/main.js').default;
 
 solo(process.argv[1], process.argv.splice(2)).then(
diff --git a/packages/cosmic-swingset/lib/ag-chain-cosmos b/packages/cosmic-swingset/lib/ag-chain-cosmos
index dc0056d2db2..eeca6fd9e62 100755
--- a/packages/cosmic-swingset/lib/ag-chain-cosmos
+++ b/packages/cosmic-swingset/lib/ag-chain-cosmos
@@ -4,6 +4,10 @@ const path = require('path');
 const agcc = require('bindings')('agcosmosdaemon.node');
 const esmRequire = require('esm')(module);
 
+esmRequire('./agoric-anylogger');
+const anylogger = require('anylogger');
+const log = anylogger('ag-chain-cosmos');
+
 const main = esmRequire('./chain-main.js').default;
 
 main(process.argv[1], process.argv.splice(2), {
@@ -13,7 +17,7 @@ main(process.argv[1], process.argv.splice(2), {
 }).then(
   _res => 0,
   rej => {
-    console.log(`error running ag-chain-cosmos:`, rej);
+    log.error(`error running ag-chain-cosmos:`, rej);
     process.exit(1);
   },
 );