Merge branch 'master' into simon/bisq-dashboard

# Conflicts: # frontend/package-lock.json # frontend/src/app/components/master-page/master-page.component.html
2021-04-23 15:35:35 +04:00
parent 47bae32e5b 19bfa9cc94
commit 5d242aa39f
32 changed files with 358 additions and 64 deletions
--- a/backend/src/index.ts
+++ b/backend/src/index.ts
@@ -81,7 +81,7 @@ class Server {
      await checkDbConnection();
    }

-    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED) {
+    if (config.STATISTICS.ENABLED && config.DATABASE.ENABLED && cluster.isMaster) {
      statistics.startStatistics();
    }