Merge branch 'master' into mononaut/failover-timeout-config

2023-11-10 14:09:43 +09:00
parent c1f0eac8f8 3580d060ce
commit a663cca3d0
118 changed files with 1935 additions and 919 deletions
--- a/backend/src/fixtures/mempool-config.template.json
+++ b/backend/src/fixtures/mempool-config.template.json
@@ -71,6 +71,7 @@
    "DATABASE": "__DATABASE_DATABASE__",
    "USERNAME": "__DATABASE_USERNAME__",
    "PASSWORD": "__DATABASE_PASSWORD__",
+    "PID_DIR": "__DATABASE_PID_FILE__",
    "TIMEOUT": 3000
  },
  "SYSLOG": {