update Rake tasks

2 files changed, 18 insertions, 18 deletions

diff --git a/lib/tasks/collector.rake b/lib/tasks/collector.rake
index 3030e88..d6309be 100644
--- a/lib/tasks/collector.rake
+++ b/lib/tasks/collector.rake
@@ -1,9 +1,9 @@
 namespace :collector do
-  @pid_file = Rails.root.join("tmp", "pids", "collector.pid").to_s
-  @log_file = Rails.root.join("log", "collector.log").to_s
+  @collector_pid_file = Rails.root.join("tmp", "pids", "collector.pid").to_s
+  @collector_log_file = Rails.root.join("log", "collector.log").to_s
   
-  def read_pid
-    Integer(File.read(@pid_file)) rescue nil
+  def collector_read_pid
+    Integer(File.read(@collector_pid_file)) rescue nil
   end
   
   def process_alive?(pid)
@@ -17,16 +17,16 @@ namespace :collector do
   
   desc "Start aclog collector (master)"
   task start: :environment do
-    pid = read_pid
+    pid = collector_read_pid
     if pid && process_alive?(pid)
       STDERR.puts "Collector daemon is already started (PID: #{pid})"
       next
     end
 
     Process.daemon
-    File.open(@pid_file, "w").write(Process.pid)
+    File.open(@collector_pid_file, "w").write(Process.pid)
 
-    log = File.open(@log_file, "a")
+    log = File.open(@collector_log_file, "a")
     log.sync = true
     STDOUT.reopen(log)
     STDERR.reopen(STDOUT)
@@ -36,7 +36,7 @@ namespace :collector do
 
   desc "Stop aclog collector (master)"
   task :stop do
-    pid = read_pid
+    pid = collector_read_pid
     unless process_alive?(pid)
       puts "Collector daemon is not started."
       next
@@ -47,7 +47,7 @@ namespace :collector do
       sleep 0.1
     end
 
-    File.delete(@pid_file)
+    File.delete(@collector_pid_file)
   end
 
   desc "Retart aclog collector (master)"
@@ -58,7 +58,7 @@ namespace :collector do
 
   desc "Show status of running aclog collector (master)"
   task :status do
-    pid = read_pid
+    pid = collector_read_pid
     if pid && process_alive?(pid)
       puts "Collector is running."
     else
diff --git a/lib/tasks/web.rake b/lib/tasks/web.rake
index 43f6937..db5319e 100644
--- a/lib/tasks/web.rake
+++ b/lib/tasks/web.rake
@@ -1,8 +1,8 @@
 namespace :web do
-  @pid_file = Rails.root.join("tmp", "pids", "puma.pid").to_s
+  @web_pid_file = Rails.root.join("tmp", "pids", "puma.pid").to_s
   
-  def read_pid
-    Integer(File.read(@pid_file)) rescue nil
+  def web_read_pid
+    Integer(File.read(@web_pid_file)) rescue nil
   end
   
   def process_alive?(pid)
@@ -11,17 +11,17 @@ namespace :web do
 
   desc "Start web server (puma)"
   task :start do
-    pid = read_pid
+    pid = web_read_pid
     if pid && process_alive?(pid)
       STDERR.puts "Puma is already started (PID: #{pid})"
       next
     end
-    echo `puma -d -e #{Rails.env} -C #{Rails.root}/config/puma.rb --pidfile #{@pid_file}`
+    puts `puma -d -e #{Rails.env} -C #{Rails.root}/config/puma.rb --pidfile #{@web_pid_file}`
   end
 
   desc "Stop web server (puma)"
   task :stop do
-    pid = read_pid
+    pid = web_read_pid
     unless process_alive?(pid)
       STDERR.puts "Puma is not running."
       next
@@ -35,7 +35,7 @@ namespace :web do
 
   desc "Retart web server (puma)"
   task :restart do
-    pid = read_pid
+    pid = web_read_pid
     unless process_alive?(pid)
       STDERR.puts "Puma is not running."
       Rake::Task["web:start"].invoke
@@ -46,7 +46,7 @@ namespace :web do
 
   desc "Show status of web server (puma)"
   task :status do
-    pid = read_pid
+    pid = web_read_pid
     if pid && process_alive?(pid)
       STDOUT.puts "Puma is running."
     else