From 061b4f9b9133d475728bf0485054cc64afd68757 Mon Sep 17 00:00:00 2001
From: Kay0u <pierre@kayou.io>
Date: Fri, 11 Dec 2020 14:40:13 +0100
Subject: [PATCH] update starting message of sidekiq

---
 conf/mastodon-sidekiq.service   | 26 +++++++++++++-------------
 conf/mastodon-streaming.service | 28 ++++++++++++++--------------
 conf/mastodon-web.service       | 26 +++++++++++++-------------
 scripts/install                 |  2 +-
 scripts/restore                 |  2 +-
 scripts/upgrade                 |  2 +-
 6 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/conf/mastodon-sidekiq.service b/conf/mastodon-sidekiq.service
index a4fc0da..7031e63 100644
--- a/conf/mastodon-sidekiq.service
+++ b/conf/mastodon-sidekiq.service
@@ -1,18 +1,18 @@
 [Unit]
- Description=__APP__-sidekiq
- After=network.target
+Description=__APP__-sidekiq
+After=network.target
 
 [Service]
- Type=simple
- User=__APP__
- WorkingDirectory=__FINALPATH__/live
- Environment="RAILS_ENV=production"
- Environment="DB_POOL=25"
- Environment="MALLOC_ARENA_MAX=2"
- ExecStart=__RBENV_ROOT__/shims/bundle exec sidekiq -c 25
- TimeoutSec=15
- Restart=always
- StandardError=syslog
+Type=simple
+User=__APP__
+WorkingDirectory=__FINALPATH__/live
+Environment="RAILS_ENV=production"
+Environment="DB_POOL=25"
+Environment="MALLOC_ARENA_MAX=2"
+ExecStart=__RBENV_ROOT__/shims/bundle exec sidekiq -c 25
+TimeoutSec=15
+Restart=always
+StandardError=syslog
 
 [Install]
- WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/conf/mastodon-streaming.service b/conf/mastodon-streaming.service
index dd9a605..673b7ae 100644
--- a/conf/mastodon-streaming.service
+++ b/conf/mastodon-streaming.service
@@ -1,19 +1,19 @@
 [Unit]
- Description=__APP__-streaming
- After=network.target
+Description=__APP__-streaming
+After=network.target
 
 [Service]
- Type=simple
- User=__APP__
- WorkingDirectory=__FINALPATH__/live
- Environment="NODE_ENV=production"
- Environment="PORT=__PORT_STREAM__"
- Environment="STREAMING_CLUSTER_NUM=1"
- Environment="__YNH_NODE_LOAD_PATH__"
- ExecStart=__YNH_NODE__ ./streaming
- TimeoutSec=15
- Restart=always
- StandardError=syslog
+Type=simple
+User=__APP__
+WorkingDirectory=__FINALPATH__/live
+Environment="NODE_ENV=production"
+Environment="PORT=__PORT_STREAM__"
+Environment="STREAMING_CLUSTER_NUM=1"
+Environment="__YNH_NODE_LOAD_PATH__"
+ExecStart=__YNH_NODE__ ./streaming
+TimeoutSec=15
+Restart=always
+StandardError=syslog
 
 [Install]
- WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/conf/mastodon-web.service b/conf/mastodon-web.service
index bb07cf4..1f5b6be 100644
--- a/conf/mastodon-web.service
+++ b/conf/mastodon-web.service
@@ -1,18 +1,18 @@
 [Unit]
- Description=__APP__-web
- After=network.target
+Description=__APP__-web
+After=network.target
 
 [Service]
- Type=simple
- User=__APP__
- WorkingDirectory=__FINALPATH__/live
- Environment="RAILS_ENV=production"
- Environment="PORT=__PORT_WEB__"
- ExecStart=__RBENV_ROOT__/shims/bundle exec puma -C config/puma.rb
- ExecReload=/bin/kill -SIGUSR1 $MAINPID
- TimeoutSec=15
- Restart=always
- StandardError=syslog
+Type=simple
+User=__APP__
+WorkingDirectory=__FINALPATH__/live
+Environment="RAILS_ENV=production"
+Environment="PORT=__PORT_WEB__"
+ExecStart=__RBENV_ROOT__/shims/bundle exec puma -C config/puma.rb
+ExecReload=/bin/kill -SIGUSR1 $MAINPID
+TimeoutSec=15
+Restart=always
+StandardError=syslog
 
 [Install]
- WantedBy=multi-user.target
+WantedBy=multi-user.target
diff --git a/scripts/install b/scripts/install
index 84e8553..6111ae9 100644
--- a/scripts/install
+++ b/scripts/install
@@ -263,7 +263,7 @@ yunohost service add "$app-streaming" --description "$app streaming service" --l
 ynh_script_progression --message="Starting a systemd service..."
 
 ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on tcp"
-ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Starting processing"
+ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Schedules Loaded"
 ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Worker 1 now listening"
 
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index 513d924..84610eb 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -152,7 +152,7 @@ yunohost service add "$app-streaming" --description "$app streaming service" --l
 ynh_script_progression --message="Starting a systemd service..."
 
 ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on tcp"
-ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Starting processing"
+ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Schedules Loaded"
 ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Worker 1 now listening"
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 895049b..03408b1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -352,7 +352,7 @@ fi
 ynh_script_progression --message="Starting a systemd service..."
 
 ynh_systemd_action --service_name=${app}-web --action="start" --log_path=systemd --line_match="Listening on tcp"
-ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Starting processing"
+ynh_systemd_action --service_name=${app}-sidekiq --action="start" --log_path=systemd --line_match="Schedules Loaded"
 ynh_systemd_action --service_name=${app}-streaming --action="start" --log_path=systemd --line_match="Worker 1 now listening"
 
 #=================================================