From 2925473d6bebe531bcd68264662eac5bdcc826f8 Mon Sep 17 00:00:00 2001 From: Kay0u Date: Fri, 22 May 2020 14:21:54 +0200 Subject: [PATCH] fix line_match with --extended-regexp --- scripts/change_url | 2 +- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/change_url b/scripts/change_url index 9a46026..17b7a1e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -45,6 +45,6 @@ ynh_add_uwsgi_service 'pgadmin_user python_version' ynh_script_progression --message="Reloading services..." sudo systemctl reload nginx.service ynh_systemd_action --service_name "uwsgi-app@$app.service" --action restart \ - --line_match "WSGI app 0 (mountpoint='$path_url') ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" + --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" ynh_script_progression --message="Change of URL completed for $app" --last diff --git a/scripts/install b/scripts/install index 5663fc3..253c825 100644 --- a/scripts/install +++ b/scripts/install @@ -117,6 +117,6 @@ ynh_use_logrotate --logfile /var/log/pgadmin # reload uwsgi ynh_script_progression --message="Starting pgadmin services..." --weight=3 ynh_systemd_action --service_name "uwsgi-app@$app.service" \ - --line_match "WSGI app 0 (mountpoint='$path_url') ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" + --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" ynh_script_progression --message="Installation of $app completed" --last diff --git a/scripts/restore b/scripts/restore index f9246f4..0f5d7ad 100644 --- a/scripts/restore +++ b/scripts/restore @@ -70,7 +70,7 @@ ynh_use_logrotate --logfile /var/log/pgadmin # reload uwsgi and nginx ynh_script_progression --message="Starting pgadmin services..." --weight=3 ynh_systemd_action --service_name "uwsgi-app@$app.service" \ - --line_match "WSGI app 0 (mountpoint='$path_url') ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" + --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" systemctl reload nginx ynh_script_progression --message="Restoration completed for $app" --last diff --git a/scripts/upgrade b/scripts/upgrade index 938eb3a..98e5613 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,6 +70,6 @@ ynh_use_logrotate --logfile /var/log/pgadmin --nonappend # reload uwsgi ynh_script_progression --message="Restarting pgadmin services..." --weight=3 ynh_systemd_action --service_name "uwsgi-app@$app.service" \ - --line_match "WSGI app 0 (mountpoint='$path_url') ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" + --line_match "WSGI app 0 \(mountpoint='$path_url'\) ready in [[:digit:]]* seconds on interpreter" --log_path "/var/log/uwsgi/$app/pgadmin.log" ynh_script_progression --message="Upgrade of $app completed" --last