feat(logger): removed table from all loggers

golemfactory · Nov 8, 2023 · e935f5a · e935f5a
1 parent 2d598a3
commit e935f5a
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 17 deletions.
diff --git a/examples/docs-examples/examples/transferring-data/transfer-data-in-browser.html b/examples/docs-examples/examples/transferring-data/transfer-data-in-browser.html
@@ -93,7 +93,6 @@ <h3>Logs</h3>
         debug: (msg) => appendLog(`[${new Date().toISOString()}] [debug] ${msg}`),
         error: (msg) => appendLog(`[${new Date().toISOString()}] [error] ${msg}`),
         info: (msg) => appendLog(`[${new Date().toISOString()}] [info] ${msg}`),
-        table: (msg) => appendLog(JSON.stringify(msg, null, "\t")),
       };
 
       async function run() {

diff --git a/examples/docs-examples/examples/transferring-data/upload-json-in-browser.html b/examples/docs-examples/examples/transferring-data/upload-json-in-browser.html
@@ -24,7 +24,6 @@
         debug: (msg) => 0, //appendLog(msg, 'debug'),
         error: (msg) => appendLog(msg, "error"),
         info: (msg) => appendLog(msg, "info"),
-        table: (msg) => appendLog(JSON.stringify(msg, null, "\t")),
       };
       async function run() {
         const executor = await TaskExecutor.create({

diff --git a/examples/docs-examples/quickstarts/web-quickstart/requestor.mjs b/examples/docs-examples/quickstarts/web-quickstart/requestor.mjs
@@ -20,7 +20,6 @@ const logger = {
   debug: (msg) => appendLog(msg, "debug"),
   error: (msg) => appendLog(msg, "error"),
   info: (msg) => appendLog(msg, "info"),
-  table: (msg) => appendLog(JSON.stringify(msg, null, "\t")),
 };
 
 async function run() {

diff --git a/examples/docs-examples/tutorials/running-from-browser/index.html b/examples/docs-examples/tutorials/running-from-browser/index.html
@@ -60,7 +60,6 @@ <h3>Logs</h3>
         debug: (msg) => console.log(msg),
         error: (msg) => appendLog(`[${new Date().toISOString()}] [error] ${msg}`),
         info: (msg) => appendLog(`[${new Date().toISOString()}] [info] ${msg}`),
-        table: (msg) => appendLog(JSON.stringify(msg, null, "\t")),
       };
       async function run() {
         const executor = await TaskExecutor.create({

diff --git a/examples/web/hello.html b/examples/web/hello.html
@@ -80,7 +80,6 @@ <h3>Logs</h3>
         debug: (msg) => appendLog(`[${new Date().toISOString()}] [debug] ${msg}`),
         error: (msg) => appendLog(`[${new Date().toISOString()}] [error] ${msg}`),
         info: (msg) => appendLog(`[${new Date().toISOString()}] [info] ${msg}`),
-        table: (msg) => appendLog(JSON.stringify(msg, null, "\t")),
       };
       async function run() {
         const apiKey = document.getElementById("YAGNA_APPKEY").value;

diff --git a/examples/web/image.html b/examples/web/image.html
@@ -104,7 +104,6 @@ <h3>Logs</h3>
         debug: (msg) => appendLog(`[${new Date().toISOString()}] [debug] ${msg}`),
         error: (msg) => appendLog(`[${new Date().toISOString()}] [error] ${msg}`),
         info: (msg) => appendLog(`[${new Date().toISOString()}] [info] ${msg}`),
-        table: (msg) => appendLog(JSON.stringify(msg, null, "\t")),
       };
 
       async function run() {

diff --git a/src/executor/executor.ts b/src/executor/executor.ts
@@ -538,7 +538,11 @@ export class TaskExecutor {
     const providersCount = new Set(costsSummary.map((x) => x["Provider Name"])).size;
     this.logger?.info(`Computation finished in ${duration}`);
     this.logger?.info(`Negotiated ${costsSummary.length} agreements with ${providersCount} providers`);
-    if (costsSummary.length) this.logger?.table?.(costsSummary);
+    costsSummary.forEach((cost) => {
+      this.logger?.info(
+        `Agreement ${cost["Agreement"]} with ${cost["Provider Name"]} computed ${cost["Task Computed"]} task(s) for ${cost["Cost"]} GLM (${cost["Payment Status"]})`,
+      );
+    });
     this.logger?.info(`Total Cost: ${costs.total} Total Paid: ${costs.paid}`);
   }
 

diff --git a/src/utils/logger/consoleLogger.ts b/src/utils/logger/consoleLogger.ts
@@ -12,7 +12,6 @@ export function consoleLogger(): Logger {
     log: (msg: string) => print("log", msg),
     setLevel: (lvl: string) => (level = lvl),
     warn: (msg) => print("warn", msg),
-    table: (obj) => console.table(obj),
     level,
   };
 }
diff --git a/src/utils/logger/logger.ts b/src/utils/logger/logger.ts
@@ -13,11 +13,4 @@ export interface Logger {
   warn(msg);
   error(msg);
   debug(msg);
-
-  /**
-   * Produce a table representation of the supplied data.
-   * This is currently used to display cost summary.
-   * @param object
-   */
-  table?(object);
 }
diff --git a/src/utils/logger/nullLogger.ts b/src/utils/logger/nullLogger.ts
@@ -12,7 +12,6 @@ export function nullLogger(): Logger {
     log: nullFunc,
     warn: nullFunc,
     error: nullFunc,
-    table: nullFunc,
     setLevel: nullFunc,
   };
 }
diff --git a/src/utils/logger/pinoLogger.ts b/src/utils/logger/pinoLogger.ts
@@ -10,7 +10,6 @@ export function pinoLogger(optionsOrStream?: pino.LoggerOptions | pino.Destinati
     log: (msg) => logger.info(msg),
     warn: (msg) => logger.warn(msg),
     error: (msg) => logger.error(msg),
-    table: (object) => console.table(object),
     setLevel: function (level: string) {
       logger.level = level;
       this.level = level as LogLevel;