phantom-manager 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTMwOTMzODZlNjhlMzhiYTZiODM1ZTZlZGNkMTk4Y2JmODY4MjlmMg==
+    MTE0YmJjYjE5Yzc0ZjAyYWI4ZjI1M2E4OTA0MzY3YTAyYjQ4MjU1ZQ==
   data.tar.gz: !binary |-
-    MmI1Nzk1ZWQwNDcwMzA5OWJmZDE1YTk1MDg4Y2MzYjIxNGNlYzBjMA==
+    MjM5ZWFhMTA3MWE5NDY3ZjY1MWNlMTY2NmY4NDM2MjllZWQyNjk2ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTU4MDg4MGUyOTFhZDE2YjFmYjA1OTQ2NjQyMTQzNjQxMWI2ZWI4ZTMxNDAz
-    YWJlYjRhNjM5OTg5NTJhYzQ1MWZhYzMyNTE3ZWU5Zjc2NzBmMTAyYzQyYzE1
-    Njg3YzA4ZGI5MGQyZmM1ZmE0ZjEwZGEwNjM3ZGZjY2U4YjVlMGQ=
+    ZmFhNzlmZjAzNTk5MzU0YTYxZWIxZDc2MTUzZGE2ZTMzMzdjN2JhNGQxMDQ1
+    MDZjN2VhZTRkYzM0MjE1N2I3MDQzYzE3NTBmMjk2ODE1OTgzMmZlNDQ1NjBj
+    M2VmY2UwNmYzYzNjNGZhMjBlMzcxM2VkMWYwNzgwZGZkMTA0OWY=
   data.tar.gz: !binary |-
-    ZDRjYmYzNjdkMWUyODkxZGVhNzRkMjkwMjIxMmUxNjNkMDE3YjM1YWRiZGUw
-    ZDY1ODZiY2RhOTE3ODE1YTA1ODVmY2ZkMTMwMGMyOGE4ODVmYWViMmFkMjVj
-    ODI5ZjViMTBmOTUyYWExOGUzYzNmOTBmMDU3NTIzOTViMGJhYmE=
+    ZjM2MmMyZGFjYjRlNDVmZWM1ZTllYWI3M2Y0OTI4OWNmZWQ4ZGYzZDE1Mjg2
+    YTgxOTFjY2RiMmRkMWRkZWNhMGM1YWU1ZWFmZDc2MjVhZTdhN2ZkOTVmODRk
+    NDQzY2UyMjVlZjZiOTBhNWRiMTYzMDI0MGY1OGRlOTE2OTJiYzk=

data/Gemfile.lock

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

data/lib/nginx/manager.rb

@@ -1,26 +1,29 @@
 require 'utils/logger'
 require 'utils/cfg'
+require 'utils/shell'
 
 module Nginx
   class Manager
     class << self
 
-      def remove(port)
-        $logger.info "removing #{port} from nginx"
+      def remove(ports)
+        ports = [*ports]
+        $logger.info "removing #{ports} from nginx"
         modify_nginx do |ofile, iline|
-          ofile.puts(iline) unless iline =~ /#{port}/
+          ofile.puts(iline) if !line_matches_ports(iline, ports)
         end
       end
 
-      def add(port)
-        $logger.info "adding #{port} to nginx"
-        if !port_defined?(port)
-          modify_nginx do |ofile, iline|
-            ofile.puts(iline)
-            ofile.puts(phantom_upstream(port)) if iline =~ /upstream phantomjs/
+      def add(ports)
+        ports = [*ports]
+        $logger.info "adding #{ports} to nginx"
+        modify_nginx do |ofile, iline|
+          ofile.puts(iline)
+          if iline =~ /upstream phantomjs/
+            ports.each do |port|
+              ofile.puts(phantom_upstream(port)) unless port_defined?(port)
+            end
           end
-        else
-          $logger.info "port #{port} already defined"
         end
       end
 
@@ -41,7 +44,7 @@ module Nginx
 
       def reload_nginx
         $logger.info "reloading nginx"
-        `nginx -s reload`
+        Utils::Shell.execute "nginx -s reload"
       end
 
       def modify_nginx
@@ -54,6 +57,14 @@ module Nginx
         reload_nginx
       end
 
+      def line_matches_ports(line, ports)
+        line =~ ports_regexp(ports)
+      end
+
+      def ports_regexp(ports)
+        /#{ports.join("|")}/
+      end
+
     end
   end
 end

data/lib/phantom/collector.rb

@@ -10,7 +10,7 @@ module Phantom
 
       def get_running_instances
         lines = running_phantoms_shell_output.split("\n")
-        lines.map {|l| Phantom::Process.from_string(l) }
+        parse_processes lines
       end
 
       def missing_ports
@@ -23,12 +23,25 @@ module Phantom
 
       private
 
+      def parse_processes(lines)
+        processes = lines.map {|l| Phantom::Process.from_string(l) }
+        bad_processes = processes.select {|p| !required_ports.include?(p.port)}
+        log_error(bad_processes, lines) if bad_processes.any?
+        processes.select {|p| required_ports.include?(p.port)}
+      end
+
       def running_phantoms_shell_output
         `#{running_phantoms_shell_command}`
       end
 
       def running_phantoms_shell_command
-        "ps -e -www -o pid,rss,command | grep 'phantomjs' | grep -v sh | grep -v grep"
+        "ps -e -www -o pid,rss,command | grep 'phantomjs rndrme.js' | grep -v sh | grep -v grep"
+      end
+
+      def log_error(processes, lines)
+        $logger.error "Collector got bad process!"
+        $logger.error "Processes were #{processes}"
+        $logger.error "lines were: #{lines}"
       end
 
     end

data/lib/phantom/manager.rb

@@ -7,25 +7,28 @@ module Phantom
   module Manager
     class << self
 
-      def restart(process)
-        $logger.info "restarting process #{process}"
-        stop process
-        start process
+      def restart(processes)
+        processes = [*processes]
+        $logger.info "restarting process #{processes}"
+        stop processes
+        start processes
       end
 
-      def start(process)
-        $logger.info "starting process #{process.port}"
-        process.start
-        Nginx::Manager.add(process.port)
+      def start(processes)
+        processes = [*processes]
+        $logger.info "starting process #{processes}"
+        processes.each(&:start)
+        Nginx::Manager.add(processes.map(&:port))
       end
 
       private 
 
-      def stop(process)
-        $logger.info "stopping process #{process}"
-        Nginx::Manager.remove(process.port)
+      def stop(processes)
+        processes = [*processes]
+        $logger.info "stopping process #{processes}"
+        Nginx::Manager.remove(processes.map(&:port))
         sleep Cfg.phantom_termination_grace
-        process.kill
+        processes.each(&:kill)
       end
 
     end

data/lib/phantom/manager/version.rb

@@ -1,5 +1,5 @@
 module Phantom
   module Manager
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/lib/phantom/process.rb

@@ -44,6 +44,13 @@ module Phantom
       Utils::Shell.execute start_command
     end
 
+    def to_s
+      inspect
+    end
+
+    def inspect
+      "pid: #{pid}, port: #{port}, memory_usage: #{memory_usage}, command: #{command}"
+    end
     private
 
     def start_command

data/spec/lib/nginx/manager_spec.rb

@@ -33,6 +33,10 @@ CONF
 
 module Nginx
   describe Manager do
+    let :ports do
+      (8002..8011).to_a
+    end
+
     subject {Manager}
 
     def port_defined?(port)
@@ -57,6 +61,16 @@ module Nginx
           }.to change{port_defined?(8003)}.from(true).to(false)
         end
       end
+
+      context "multiple ports" do
+        it "should be removed" do
+          ports_to_remove = [8002, 8003, 8006]
+          ports.each {|p| port_defined?(p).should be_true}
+          subject.remove(ports_to_remove)
+          ports_to_remove.each {|p| port_defined?(p).should be_false}
+          (ports-ports_to_remove).each {|p| port_defined?(p).should be_true}
+        end
+      end
     end
 
     describe :add do
@@ -75,6 +89,15 @@ module Nginx
           }.not_to change{port_defined?(8003)}
         end
       end
+
+      context "multiple ports" do
+        it "should add them all" do
+          ports_to_add = [8012, 8013]
+          ports.each {|p| port_defined?(p).should be_true}
+          subject.add(ports_to_add)
+          ports_to_add.each {|p| port_defined?(p).should be_true}
+        end
+      end
     end
   end
 end

data/spec/lib/phantom/collector_spec.rb

@@ -54,6 +54,29 @@ module Phantom
       end
     end
 
+    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"}
+          ]
+        ps = phantoms_ps_shell_output(phantoms)
+        subject.stub(:running_phantoms_shell_output).and_return(ps)
+      end
+
+      it "should not return bad phantom processes" do
+        generated_phantoms = subject.get_running_instances
+        generated_phantoms.size.should eq 1
+        generated_phantoms.first.port.should eq 8003
+      end
+
+      it "should log error with bad phantoms" do
+        subject.should_receive(:log_error).once
+        subject.get_running_instances
+      end
+
+    end
+
 
   end
 end

data/spec/lib/phantom/manager_spec.rb

@@ -8,18 +8,18 @@ module Phantom
 
     describe :start do
 
-      let(:p) {generate_process}
+      let(:p) { generate_process }
+      let(:processes) {[generate_process, generate_process, generate_process ]}
 
       it "should start new phantom process" do
-        p.should_receive :start
-        subject.start(p)
+        processes.each {|p| p.should_receive :start}
+        subject.start(processes)
       end
 
       it "should add port to nginx conf" do
-        Nginx::Manager.should_receive(:add).with(p.port).once
-        subject.start(p)
+        Nginx::Manager.should_receive(:add).with(processes.map(&:port)).once
+        subject.start(processes)
       end
     end
-
   end
 end

data/spec/lib/phantom/process_spec.rb

@@ -43,5 +43,12 @@ module Phantom
         p.start
       end
     end
+
+    describe :inspect do
+      it "should present all data in string" do
+        p = generate_process
+        "#{p}".should eq "pid: #{p.pid}, port: #{p.port}, memory_usage: #{p.memory_usage}, command: #{p.command}"
+      end
+    end
   end
 end

data/spec/shared_spec.rb

@@ -40,6 +40,6 @@ def data_to_ps(p)
  "#{p[:pid]} #{p[:memory_usage]} #{p[:command]}"
 end
 
-def phantoms_ps_shell_output
-  phantoms_data.map {|p| data_to_ps(p) }.join("\n")
+def phantoms_ps_shell_output(data = phantoms_data)
+  data.map {|p| data_to_ps(p) }.join("\n")
 end

data/spec/spec_helper.rb

@@ -25,5 +25,6 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = 'random'
 
+  require 'utils/shell'
   config.before(:each)  { Utils::Shell.stub(:system) }
 end

metadata

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