diff options
author | Sebastian <sebasjm@gmail.com> | 2021-06-08 15:58:13 -0300 |
---|---|---|
committer | Sebastian <sebasjm@gmail.com> | 2021-06-08 17:18:24 -0300 |
commit | 2e1438eb048e48ec7aa71246878b1125c9e34694 (patch) | |
tree | 142ae520aa09b16785c3f9dd7a41575d6349db33 /packages/taler-wallet-core/src/util | |
parent | 2c5612fd63f766ce19a9f885e5142b04bcf11604 (diff) | |
download | wallet-core-2e1438eb048e48ec7aa71246878b1125c9e34694.tar.xz |
moving logger into taler-util
Diffstat (limited to 'packages/taler-wallet-core/src/util')
-rw-r--r-- | packages/taler-wallet-core/src/util/RequestThrottler.ts | 2 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/util/coinSelection.ts | 3 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/util/http.ts | 2 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/util/logging.ts | 100 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/util/query.ts | 3 | ||||
-rw-r--r-- | packages/taler-wallet-core/src/util/timer.ts | 3 |
6 files changed, 5 insertions, 108 deletions
diff --git a/packages/taler-wallet-core/src/util/RequestThrottler.ts b/packages/taler-wallet-core/src/util/RequestThrottler.ts index b38e948fe..66a895750 100644 --- a/packages/taler-wallet-core/src/util/RequestThrottler.ts +++ b/packages/taler-wallet-core/src/util/RequestThrottler.ts @@ -25,9 +25,9 @@ import { getTimestampNow, timestampDifference, timestampCmp, + Logger, } from "@gnu-taler/taler-util"; import { URL } from "./url"; -import { Logger } from "./logging"; const logger = new Logger("RequestThrottler.ts"); diff --git a/packages/taler-wallet-core/src/util/coinSelection.ts b/packages/taler-wallet-core/src/util/coinSelection.ts index c5a75878f..bd90526a5 100644 --- a/packages/taler-wallet-core/src/util/coinSelection.ts +++ b/packages/taler-wallet-core/src/util/coinSelection.ts @@ -24,8 +24,7 @@ * Imports. */ import { AmountJson, AmountLike, Amounts } from "@gnu-taler/taler-util"; -import { strcmp } from "@gnu-taler/taler-util"; -import { Logger } from "./logging.js"; +import { strcmp, Logger } from "@gnu-taler/taler-util"; const logger = new Logger("coinSelection.ts"); diff --git a/packages/taler-wallet-core/src/util/http.ts b/packages/taler-wallet-core/src/util/http.ts index ee6ff80a2..649105f2e 100644 --- a/packages/taler-wallet-core/src/util/http.ts +++ b/packages/taler-wallet-core/src/util/http.ts @@ -25,8 +25,8 @@ * Imports */ import { OperationFailedError, makeErrorDetails } from "../operations/errors"; -import { Logger } from "./logging"; import { + Logger, Duration, Timestamp, getTimestampNow, diff --git a/packages/taler-wallet-core/src/util/logging.ts b/packages/taler-wallet-core/src/util/logging.ts deleted file mode 100644 index 4f48e24da..000000000 --- a/packages/taler-wallet-core/src/util/logging.ts +++ /dev/null @@ -1,100 +0,0 @@ -/* - This file is part of TALER - (C) 2019 GNUnet e.V. - - TALER is free software; you can redistribute it and/or modify it under the - terms of the GNU General Public License as published by the Free Software - Foundation; either version 3, or (at your option) any later version. - - TALER is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along with - TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> - */ - -/** - * Check if we are running under nodejs. - */ - -const isNode = - typeof process !== "undefined" && typeof process.release !== "undefined" && process.release.name === "node"; - -function writeNodeLog( - message: any, - tag: string, - level: string, - args: any[], -): void { - try { - process.stderr.write(`${new Date().toISOString()} ${tag} ${level} `); - process.stderr.write(`${message}`); - if (args.length != 0) { - process.stderr.write(" "); - process.stderr.write(JSON.stringify(args, undefined, 2)); - } - process.stderr.write("\n"); - } catch (e) { - // This can happen when we're trying to log something that doesn't want to be - // converted to a string. - process.stderr.write(`${new Date().toISOString()} (logger) FATAL `); - if (e instanceof Error) { - process.stderr.write("failed to write log: "); - process.stderr.write(e.message); - } - process.stderr.write("\n"); - } -} - -/** - * Logger that writes to stderr when running under node, - * and uses the corresponding console.* method to log in the browser. - */ -export class Logger { - constructor(private tag: string) {} - - info(message: string, ...args: any[]): void { - if (isNode) { - writeNodeLog(message, this.tag, "INFO", args); - } else { - console.info( - `${new Date().toISOString()} ${this.tag} INFO ` + message, - ...args, - ); - } - } - - warn(message: string, ...args: any[]): void { - if (isNode) { - writeNodeLog(message, this.tag, "WARN", args); - } else { - console.warn( - `${new Date().toISOString()} ${this.tag} INFO ` + message, - ...args, - ); - } - } - - error(message: string, ...args: any[]): void { - if (isNode) { - writeNodeLog(message, this.tag, "ERROR", args); - } else { - console.info( - `${new Date().toISOString()} ${this.tag} ERROR ` + message, - ...args, - ); - } - } - - trace(message: any, ...args: any[]): void { - if (isNode) { - writeNodeLog(message, this.tag, "TRACE", args); - } else { - console.info( - `${new Date().toISOString()} ${this.tag} TRACE ` + message, - ...args, - ); - } - } -} diff --git a/packages/taler-wallet-core/src/util/query.ts b/packages/taler-wallet-core/src/util/query.ts index 7c2aea783..6a3db44d7 100644 --- a/packages/taler-wallet-core/src/util/query.ts +++ b/packages/taler-wallet-core/src/util/query.ts @@ -33,9 +33,8 @@ import { IDBVersionChangeEvent, Event, IDBCursor, - IDBKeyPath, } from "@gnu-taler/idb-bridge"; -import { Logger } from "./logging"; +import { Logger } from "@gnu-taler/taler-util"; const logger = new Logger("query.ts"); diff --git a/packages/taler-wallet-core/src/util/timer.ts b/packages/taler-wallet-core/src/util/timer.ts index 9133bd572..a7fe7dd70 100644 --- a/packages/taler-wallet-core/src/util/timer.ts +++ b/packages/taler-wallet-core/src/util/timer.ts @@ -24,8 +24,7 @@ /** * Imports. */ -import { Duration } from "@gnu-taler/taler-util"; -import { Logger } from "./logging"; +import { Logger, Duration } from "@gnu-taler/taler-util"; const logger = new Logger("timer.ts"); |