From 869adea706cfb0faed7cd659241e1556422d2439 Mon Sep 17 00:00:00 2001
From: Kirill Fedoseev <k.fedoseev@innopolis.university>
Date: Sun, 6 Oct 2019 13:35:46 +0300
Subject: [PATCH] Made nice logging, instead of console.log

---
 src/oracle/bncWatcher/Dockerfile   |  2 +-
 src/oracle/bncWatcher/package.json |  4 +++-
 src/oracle/ethWatcher/Dockerfile   |  2 +-
 src/oracle/ethWatcher/package.json |  4 +++-
 src/oracle/proxy/Dockerfile        |  2 +-
 src/oracle/proxy/package.json      |  4 +++-
 src/oracle/shared/logger.js        | 13 +++++++++++++
 src/oracle/tss-keygen/Dockerfile   |  2 +-
 src/oracle/tss-keygen/package.json |  4 +++-
 src/oracle/tss-sign/Dockerfile     |  2 +-
 src/oracle/tss-sign/package.json   |  4 +++-
 11 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 src/oracle/shared/logger.js

diff --git a/src/oracle/bncWatcher/Dockerfile b/src/oracle/bncWatcher/Dockerfile
index ce88a65..66cef58 100644
--- a/src/oracle/bncWatcher/Dockerfile
+++ b/src/oracle/bncWatcher/Dockerfile
@@ -9,6 +9,6 @@ COPY ./bncWatcher/package.json /watcher/
 
 RUN npm install
 
-COPY ./bncWatcher/bncWatcher.js ./shared/db.js /watcher/
+COPY ./bncWatcher/bncWatcher.js ./shared/db.js ./shared/logger.js /watcher/
 
 ENTRYPOINT ["node", "bncWatcher.js"]
diff --git a/src/oracle/bncWatcher/package.json b/src/oracle/bncWatcher/package.json
index e18e0a7..445edda 100644
--- a/src/oracle/bncWatcher/package.json
+++ b/src/oracle/bncWatcher/package.json
@@ -6,7 +6,9 @@
     "axios": "0.19.0",
     "bech32": "1.1.3",
     "bignumber.js": "9.0.0",
-    "ethers": "4.0.33"
+    "ethers": "4.0.33",
+    "pino": "5.13.4",
+    "pino-pretty": "3.2.1"
   }
 }
 
diff --git a/src/oracle/ethWatcher/Dockerfile b/src/oracle/ethWatcher/Dockerfile
index 43ecf64..a1929fc 100644
--- a/src/oracle/ethWatcher/Dockerfile
+++ b/src/oracle/ethWatcher/Dockerfile
@@ -9,6 +9,6 @@ COPY ./ethWatcher/package.json /watcher/
 
 RUN npm install
 
-COPY ./ethWatcher/ethWatcher.js ./shared/db.js /watcher/
+COPY ./ethWatcher/ethWatcher.js ./shared/db.js ./shared/logger.js /watcher/
 
 ENTRYPOINT ["node", "ethWatcher.js"]
diff --git a/src/oracle/ethWatcher/package.json b/src/oracle/ethWatcher/package.json
index 7a0ca22..7e6cb8e 100644
--- a/src/oracle/ethWatcher/package.json
+++ b/src/oracle/ethWatcher/package.json
@@ -7,6 +7,8 @@
     "web3": "1.0.0-beta.55",
     "ethers": "4.0.33",
     "bignumber.js": "9.0.0",
-    "bech32": "1.1.3"
+    "bech32": "1.1.3",
+    "pino": "5.13.4",
+    "pino-pretty": "3.2.1"
   }
 }
diff --git a/src/oracle/proxy/Dockerfile b/src/oracle/proxy/Dockerfile
index bba1b5f..c6f9dd6 100644
--- a/src/oracle/proxy/Dockerfile
+++ b/src/oracle/proxy/Dockerfile
@@ -6,6 +6,6 @@ COPY ./proxy/package.json /proxy/
 
 RUN npm install
 
-COPY ./proxy/index.js ./proxy/encode.js ./proxy/decode.js /proxy/
+COPY ./proxy/index.js ./proxy/encode.js ./proxy/decode.js ./shared/logger.js /proxy/
 
 ENTRYPOINT ["node", "index.js"]
diff --git a/src/oracle/proxy/package.json b/src/oracle/proxy/package.json
index 75df602..d941190 100644
--- a/src/oracle/proxy/package.json
+++ b/src/oracle/proxy/package.json
@@ -9,6 +9,8 @@
     "axios": "0.19.0",
     "bignumber.js": "9.0.0",
     "bn.js": "5.0.0",
-    "ethers": "4.0.37"
+    "ethers": "4.0.37",
+    "pino": "5.13.4",
+    "pino-pretty": "3.2.1"
   }
 }
diff --git a/src/oracle/shared/logger.js b/src/oracle/shared/logger.js
new file mode 100644
index 0000000..2d34995
--- /dev/null
+++ b/src/oracle/shared/logger.js
@@ -0,0 +1,13 @@
+const pino = require('pino')
+
+const logger = pino({
+  name: 'logger',
+  prettyPrint: {
+    colorize: true,
+    ignore: 'time,pid,name,hostname'
+  },
+  level: process.env.LOG_LEVEL || 'debug',
+  base: {}
+})
+
+module.exports = logger
diff --git a/src/oracle/tss-keygen/Dockerfile b/src/oracle/tss-keygen/Dockerfile
index df55ef5..e84a2fb 100644
--- a/src/oracle/tss-keygen/Dockerfile
+++ b/src/oracle/tss-keygen/Dockerfile
@@ -9,7 +9,7 @@ COPY ./tss-keygen/package.json /tss/
 
 RUN npm install
 
-COPY ./tss-keygen/keygen-entrypoint.sh ./tss-keygen/keygen.js /tss/
+COPY ./tss-keygen/keygen-entrypoint.sh ./tss-keygen/keygen.js ./shared/logger.js /tss/
 
 COPY --from=tss /tss/target/release/gg18_keygen_client /tss/
 
diff --git a/src/oracle/tss-keygen/package.json b/src/oracle/tss-keygen/package.json
index d0bfe15..f38d16d 100644
--- a/src/oracle/tss-keygen/package.json
+++ b/src/oracle/tss-keygen/package.json
@@ -3,6 +3,8 @@
   "version": "0.0.1",
   "dependencies": {
     "amqplib": "0.5.3",
-    "bech32": "1.1.3"
+    "bech32": "1.1.3",
+    "pino": "5.13.4",
+    "pino-pretty": "3.2.1"
   }
 }
diff --git a/src/oracle/tss-sign/Dockerfile b/src/oracle/tss-sign/Dockerfile
index e44b104..e9a520c 100644
--- a/src/oracle/tss-sign/Dockerfile
+++ b/src/oracle/tss-sign/Dockerfile
@@ -10,7 +10,7 @@ COPY ./tss-sign/package.json /tss/
 
 RUN npm install --no-optional
 
-COPY ./tss-sign/sign-entrypoint.sh ./tss-sign/signer.js ./tss-sign/tx.js /tss/
+COPY ./tss-sign/sign-entrypoint.sh ./tss-sign/signer.js ./tss-sign/tx.js ./shared/logger.js /tss/
 
 COPY --from=tss /tss/target/release/gg18_sign_client /tss/
 
diff --git a/src/oracle/tss-sign/package.json b/src/oracle/tss-sign/package.json
index a9dd616..141a555 100644
--- a/src/oracle/tss-sign/package.json
+++ b/src/oracle/tss-sign/package.json
@@ -6,6 +6,8 @@
     "amqplib": "0.5.3",
     "axios": "0.19.0",
     "bignumber.js": "9.0.0",
-    "express": "4.17.1"
+    "express": "4.17.1",
+    "pino": "5.13.4",
+    "pino-pretty": "3.2.1"
   }
 }