phantom-manager 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWRkOTFmOTU5OGE0MjU3MTExNWMyM2E2OTdjMjFkZGFlNWMwZjhjMQ==
+    NjhjNjU4MzRjMTAyYzIxZTQyODFlMzgyNWU5NmZiZmEyYWM1YzE4Ng==
   data.tar.gz: !binary |-
-    ZGQ1ODc5YzBiNzZiNWM4ZmNkMTljOGU2MWVmMWU2YmFkMzc2NzAyYg==
+    MWQwOTQyMjZlODgzNzlmNDBjZDljZmQ5Mjc3MmI1N2IxNWQ4OTRiOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODEwZGQ3MWM3NTEyZWFlNjM3MTM5OTkwMWUxODY0ZjZiMjk1Mjg5OTAyM2Q4
-    OWU0NjljNzBkMTEwNGVjMWQzOGFiMWQ3NjkxNWYwMzlhNjBiMjA2YTMxODZl
-    MWMxMWE1NWEyODliNGU5MzdmYTY3YmUwNTZjZTJlZGNlNWUyYjk=
+    MTFkNDhkMDdkNDU5ZTJiZWEwMjFmOTk5OGFkNGQzZGMyNmEzYjMxNDFhZDVl
+    ZGQzNTAwN2I5Y2JlZmI5YmQ3ZTZiYWU0MzkzNjgwNWQ2MGRhNGRkMGRjZjFl
+    MzRhNGQxYjM3ODVkZjRhZmNmNjdmMmE2MjVlNDM0ZjA4M2I0ZTU=
   data.tar.gz: !binary |-
-    YTBmMjdlMThhMDA4NGJmNjlmNDM4ZjJhMjNhYmUxYzY5M2U2MDM5YTM2NTNm
-    N2U1MWZmN2E0NGIyYzMxOWM3YWM3YWJmZTdhN2E3MTcyZGQyODI5NTg5NzIy
-    OWNlNGZmZThiNmVmZThhNzFhZDU2MTdlZWI3YmM4NzhkZmU4NTE=
+    MThiYzY4YmFjOTdkZjI5M2FkZmYwYmNlYTc1Yjc3NWNhZTBhNWIyY2U1ZDli
+    NzVhMjJiZWNhMDhiYTliNmYxNGViYzQwMzNlODlmMDdkODUyMzFlM2E0ZGU4
+    ODk5ZDQ3ZmQwNmU2NTMxN2M3MmNiZWM5ODZiZDY4MDhkMzA4YjI=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    phantom-manager (0.0.3)
+    phantom-manager (0.0.5)
 
 GEM
   remote: https://rubygems.org/

data/config/config.yml

@@ -25,3 +25,6 @@ development:
   phantom_processes_number: 10
   processes_check_retries: 3
   processes_check_interval: 15
+
+  #Command to issue when launching phantomjs
+  phantom_command: 'phantomjs rndrme.js'

data/lib/phantom/collector.rb

@@ -35,7 +35,7 @@ module Phantom
       end
 
       def running_phantoms_shell_command
-        "ps -e -www -o pid,rss,command | grep 'phantomjs rndrme.js' | grep -v sh | grep -v grep"
+        "ps -e -www -o pid,rss,command | grep '#{Cfg.phantom_command}' | grep -v sh | grep -v grep"
       end
 
       def log_error(processes, lines)

data/lib/phantom/manager/version.rb

@@ -1,5 +1,5 @@
 module Phantom
   module Manager
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/phantom/process.rb

@@ -54,7 +54,7 @@ module Phantom
     private
 
     def start_command
-      "cd #{Cfg.rails_root} && phantomjs rndrme.js #{port} >>#{Cfg.phantom_log_path} 2>&1 &"
+      "cd #{Cfg.rails_root} && #{Cfg.phantom_command} #{port} >>#{Cfg.phantom_log_path} 2>&1 &"
     end
 
   end

data/spec/files/config.yml

@@ -10,3 +10,4 @@ test:
   memory_check_interval: 5
   processes_check_retries: 3
   processes_check_interval: 15
+  phantom_command: 'phantomjs config/phantomjs/rndrme.js'

data/spec/files/nginx.conf

@@ -3,7 +3,9 @@ upstream unicorn {
 }
 
 upstream phantomjs {
+  server 127.0.0.1:8020 fail_timeout=0; # 2013-08-01 16:06:02 +0300
   server 127.0.0.1:8002;
+  server 127.0.0.1:8003;
   server 127.0.0.1:8004;
   server 127.0.0.1:8005;
   server 127.0.0.1:8006;

data/spec/lib/phantom/collector_spec.rb

@@ -57,8 +57,8 @@ module Phantom
     describe "bad processes" do
       before do
         phantoms = [ 
-          {pid: 5555, memory_usage: 1000, command: "phantomjs rndrme.js 8020"},
-          {pid: 6666, memory_usage: 1000, command: "phantomjs rndrme.js 8003"}
+          {pid: 5555, memory_usage: 1000, command: "#{Cfg.phantom_command} 8020"},
+          {pid: 6666, memory_usage: 1000, command: "#{Cfg.phantom_command} 8003"}
           ]
         ps = phantoms_ps_shell_output(phantoms)
         subject.stub(:running_phantoms_shell_output).and_return(ps)

data/spec/lib/phantom/process_spec.rb

@@ -14,10 +14,10 @@ module Phantom
       end
 
       it "should initialize with string" do
-        p = Phantom::Process.from_string("1 2 phantomjs rndrme.js 4")
+        p = Phantom::Process.from_string("1 2 #{Cfg.phantom_command} 4")
         p.pid.should eq 1
         p.memory_usage.should eq 2
-        p.command.should eq "phantomjs rndrme.js 4"
+        p.command.should eq "#{Cfg.phantom_command} 4"
         p.port.should eq 4
       end
 

data/spec/shared_spec.rb

@@ -10,7 +10,7 @@ def generate_memory
 end
 
 def generate_process
-  Phantom::Process.new(rand(1000), generate_memory, "phantomjs rndrme.js #{rand(2000)}", 8000 + rand(10))
+  Phantom::Process.new(rand(1000), generate_memory, "#{Cfg.phantom_command} #{rand(2000)}", 8000 + rand(10))
 end
 
 def phantoms_data
@@ -18,19 +18,19 @@ def phantoms_data
     {
       pid: 1000,
       memory_usage: 100000,
-      command: "phantomjs rndrme.js 8002",
+      command: "#{Cfg.phantom_command} 8002",
       port: 8002
     },
     {
       pid: 2000,
       memory_usage: 130000,
-      command: "phantomjs rndrme.js 8003",
+      command: "#{Cfg.phantom_command} 8003",
       port: 8003
     },
     {
       pid: 3000,
       memory_usage: 80000,
-      command: "phantomjs rndrme.js 8006",
+      command: "#{Cfg.phantom_command} 8006",
       port: 8006
     }
   ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phantom-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Erez Rabih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler