lib/capistrano/helpers/delayed_job/monit.rb in capistrano-delayed_job-3.0.1 vs lib/capistrano/helpers/delayed_job/monit.rb in capistrano-delayed_job-3.0.2

@@ -5,33 +5,33 @@
       # Module Monit provides helpers for Monit/Puma combination
       ##
       module Monit
         module_function
 
-        def delayed_job_pid_file(worker_number)
-          service_pid("#{fetch(:delayed_job_runit_base_service_name)}_#{worker_number}")
+        def pid_file(worker_number)
+          service_pid("#{service_name(worker_number)}")
         end
 
-        def delayed_job_monit_service_name(worker_number)
+        def service_name(worker_number)
           "#{fetch(:delayed_job_monit_base_service_name)}_#{worker_number}"
         end
 
-        def delayed_job_monit_start_command(worker_number)
-          "/bin/bash -c '[ ! -h #{runit_service_path(delayed_job_monit_service_name(worker_number))}/run ] || /usr/bin/sv start #{runit_service_path(delayed_job_monit_service_name(worker_number))}'" # rubocop:disable Metrics/LineLength
+        def start_command(worker_number)
+          "/bin/bash -c '[ ! -h #{runit_service_path(service_name(worker_number))}/run ] || /usr/bin/sv start #{runit_service_path(service_name(worker_number))}'" # rubocop:disable Metrics/LineLength
         end
 
-        def delayed_job_monit_stop_command(worker_number)
+        def stop_command(worker_number)
           # Give delayed job 60 seconds to finish any jobs it's currently handling.
           # (Tasks that are longer than 60 seconds should be split!)
-          "/usr/bin/sv -w 60 force-stop #{runit_service_path(delayed_job_monit_service_name(worker_number))}" # rubocop:disable Metrics/LineLength
+          "/usr/bin/sv -w 60 force-stop #{runit_service_path(service_name(worker_number))}" # rubocop:disable Metrics/LineLength
         end
 
         def available_configuration_with_path(worker_number)
-          File.join(fetch(:monit_available_path), "#{fetch(:delayed_job_runit_base_service_name)}_#{worker_number}.conf")
+          File.join(fetch(:monit_available_path), "#{service_name(worker_number)}.conf")
         end
 
         def available_configuration_file(worker_number)
-          "#{fetch(:delayed_job_runit_base_service_name)}_#{worker_number}.conf"
+          "#{service_name(worker_number)}.conf"
         end
       end
     end
   end
 end