From ca82549bbe2bd8569ab5816cfd4cf3f5a208aa6d Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Wed, 29 Apr 2020 19:31:36 -0400 Subject: [PATCH] Fix nginx_clean --user flag Fixes #485 --- .../lib/nginx_stage/generators/nginx_clean_generator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx_stage/lib/nginx_stage/generators/nginx_clean_generator.rb b/nginx_stage/lib/nginx_stage/generators/nginx_clean_generator.rb index 36fdae7a7d..d54d58ac9d 100644 --- a/nginx_stage/lib/nginx_stage/generators/nginx_clean_generator.rb +++ b/nginx_stage/lib/nginx_stage/generators/nginx_clean_generator.rb @@ -44,7 +44,7 @@ class NginxCleanGenerator < Generator add_option :user do { - opt_args: ["-u", "--user", "# Operate on specific user", "# Default: nil (all users)"], + opt_args: ["-u", "--user=USER", "# Operate on specific user", "# Default: nil (all users)"], default: nil, } end @@ -56,7 +56,7 @@ class NginxCleanGenerator < Generator add_hook :delete_puns_of_users_with_no_sessions do NginxStage.active_users.each do |u| begin - next if (user && user != u) + next if (user && user != u.to_s) pid_path = PidFile.new NginxStage.pun_pid_path(user: u) socket = SocketFile.new NginxStage.pun_socket_path(user: u) cleanup_stale_files(pid_path, socket) unless pid_path.running_process?