From a213c1a0b5c46151a37b0f94ba1d92e0a282d513 Mon Sep 17 00:00:00 2001
From: tanshu <git@tanshu.com>
Date: Sat, 16 Apr 2022 17:28:00 +0530
Subject: [PATCH] Added: Process id to log. Added: Max workers to all .envs
 Added: Leardall service Added: beacon redis tunnel

---
 barker/logging.conf                      |  6 +++---
 docker/files/beacon-redis-tunnel.service | 15 +++++++++++++++
 docker/files/chd.env                     |  1 +
 docker/files/leardal.service             | 16 ++++++++++++++++
 docker/files/mhl.env                     |  1 +
 docker/files/pkl.env                     |  1 +
 6 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 docker/files/beacon-redis-tunnel.service
 create mode 100644 docker/files/leardal.service

diff --git a/barker/logging.conf b/barker/logging.conf
index 83b3c31..0782879 100644
--- a/barker/logging.conf
+++ b/barker/logging.conf
@@ -38,16 +38,16 @@ formatter=access
 args=(sys.stdout, )
 
 [formatter_generic]
-format=%(asctime)s [%(name)s %(levelname)s] %(message)s
+format=%(asctime)s [%(name)s %(levelname)s %(process)d] %(message)s
 datefmt=%Y-%m-%d %H:%M:%S %Z
 class=logging.Formatter
 
 [formatter_error]
-format=%(asctime)s [%(name)s %(levelname)s] %(message)s | %(funcName)s() | %(pathname)s L%(lineno)-4d
+format=%(asctime)s [%(name)s %(levelname)s %(process)d] %(message)s | %(funcName)s() | %(pathname)s L%(lineno)-4d
 datefmt=%Y-%m-%d %H:%M:%S %Z
 class=logging.Formatter
 
 [formatter_access]
-format=%(asctime)s [%(name)s %(levelname)s] %(message)s
+format=%(asctime)s [%(name)s %(levelname)s %(process)d] %(message)s
 datefmt=%Y-%m-%d %H:%M:%S %Z
 class=logging.Formatter
diff --git a/docker/files/beacon-redis-tunnel.service b/docker/files/beacon-redis-tunnel.service
new file mode 100644
index 0000000..b4ed3b1
--- /dev/null
+++ b/docker/files/beacon-redis-tunnel.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Keep ssh tunnel to specified remote host open
+After=network.target
+
+[Service]
+User=pi
+
+ExecStart=/usr/bin/ssh -NT -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -o ServerAliveCountMax=3 -o StrictHostKeyChecking=no -i /home/pi/.ssh/id_rsa -L 6379:localhost:6379 tanshu@beacon.tanshu.com
+
+# Restart every >2 seconds to avoid StartLimitInterval failure
+RestartSec=5
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/docker/files/chd.env b/docker/files/chd.env
index 28cee93..f85a34e 100644
--- a/docker/files/chd.env
+++ b/docker/files/chd.env
@@ -5,6 +5,7 @@ DEBUG=false
 SQLALCHEMY_DATABASE_URI=postgresql://postgres:123456@db:5432/pettychd
 MODULE_NAME=barker.main
 PROJECT_NAME=barker
+MAX_WORKERS=4
 REDIS_HOST=redis
 REDIS_PORT=6379
 SECRET_KEY=d9e4facec94d7e0bf3d63ca03b1d78d834b158627b6593274f7fe27f6aed6db4
diff --git a/docker/files/leardal.service b/docker/files/leardal.service
new file mode 100644
index 0000000..b2eab24
--- /dev/null
+++ b/docker/files/leardal.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=Reverse SSH connection
+After=network.target
+
+[Service]
+Type=simple
+User=pi
+
+ExecStart=/usr/bin/ssh -NTg -o ServerAliveInterval=60 -o ExitOnForwardFailure=yes -o ServerAliveCountMax=3 -o StrictHostKeyChecking=no -i /home/pi/.ssh/id_rsa -R {{ ssh_port }}:localhost:22 tanshu@beacon.tanshu.com
+
+# Restart every >2 seconds to avoid StartLimitInterval failure
+Restart=always
+RestartSec=5s
+
+[Install]
+WantedBy=default.target
diff --git a/docker/files/mhl.env b/docker/files/mhl.env
index 0743ee3..2d8b1ca 100644
--- a/docker/files/mhl.env
+++ b/docker/files/mhl.env
@@ -5,6 +5,7 @@ DEBUG=false
 SQLALCHEMY_DATABASE_URI=postgresql://postgres:123456@db:5432/pettymhl
 MODULE_NAME=barker.main
 PROJECT_NAME=barker
+MAX_WORKERS=4
 REDIS_HOST=redis
 REDIS_PORT=6379
 SECRET_KEY=8b7f704ad1bbee3caa683a57440a6a371937fe5f64a7712a6a15bf3165c3c598
diff --git a/docker/files/pkl.env b/docker/files/pkl.env
index 522736c..1c3a8af 100644
--- a/docker/files/pkl.env
+++ b/docker/files/pkl.env
@@ -5,6 +5,7 @@ DEBUG=false
 SQLALCHEMY_DATABASE_URI=postgresql://postgres:123456@db:5432/pettypkl
 MODULE_NAME=barker.main
 PROJECT_NAME=barker
+MAX_WORKERS=4
 REDIS_HOST=redis
 REDIS_PORT=6379
 SECRET_KEY=bd6e5dee0f3b8a6f0db50f7aa08e91d55b2ae5ab6df126defa37e80602481002