phantom-manager 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmU1OGFhZGQzODQ2NGJkNjkwN2FkNmM3ZWI0NTE3ZWI4NWY5NzEzNA==
+    MTMwOTMzODZlNjhlMzhiYTZiODM1ZTZlZGNkMTk4Y2JmODY4MjlmMg==
   data.tar.gz: !binary |-
-    OGJjMTI5Yzk1NjVkOTczM2E4MWEyMWM2NGMxMmQ2NmUzMTdmYjM4MQ==
+    MmI1Nzk1ZWQwNDcwMzA5OWJmZDE1YTk1MDg4Y2MzYjIxNGNlYzBjMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjI3NTQwNDNjMWVmZGRkYzk3NTYzZmE5MDE4YmFiNjkwNGFjMmJmMTkxOWE0
-    ODQ1MTRlYzY3NjFmMzg0MjZiZGM5ODIyOWY2NWY0NjgyNWQ0M2UyZTI1NDcx
-    MDMxZmUzZTM0OTVlMzFmYWVkNGI5MGNiZDVjNzEyYTU2Yjk3MmE=
+    MTU4MDg4MGUyOTFhZDE2YjFmYjA1OTQ2NjQyMTQzNjQxMWI2ZWI4ZTMxNDAz
+    YWJlYjRhNjM5OTg5NTJhYzQ1MWZhYzMyNTE3ZWU5Zjc2NzBmMTAyYzQyYzE1
+    Njg3YzA4ZGI5MGQyZmM1ZmE0ZjEwZGEwNjM3ZGZjY2U4YjVlMGQ=
   data.tar.gz: !binary |-
-    MzdkODY4MjYyNDc4MzFmYjlhNTc2NGE2MDg5MmMwOWI2ZTA4ZjI4ZTkwYTA2
-    YTU2OTdlMjI4MmJlNmUyZmEyYzAxOWE5ZWQyMzQzZDdiNWRmYWFmNWM5ODRj
-    ZDJiYjUzNTU4YzcyYmYyZTlhZTdiZmEzZDhmOGUzYTQwZjcyMGQ=
+    ZDRjYmYzNjdkMWUyODkxZGVhNzRkMjkwMjIxMmUxNjNkMDE3YjM1YWRiZGUw
+    ZDY1ODZiY2RhOTE3ODE1YTA1ODVmY2ZkMTMwMGMyOGE4ODVmYWViMmFkMjVj
+    ODI5ZjViMTBmOTUyYWExOGUzYzNmOTBmMDU3NTIzOTViMGJhYmE=

data/.gitignore

@@ -1,3 +1,4 @@
 .rspec
 tags
 log/*
+phantom-manager*.gem

data/Gemfile.lock

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

data/lib/monitors/memory.rb

@@ -19,7 +19,7 @@ module Monitors
       end
 
       def check_interval
-        $cfg.memory_check_interval
+        Cfg.memory_check_interval
       end
     end
 

data/lib/monitors/processes.rb

@@ -25,7 +25,7 @@ module Monitors
       end
 
       def check_interval
-        $cfg.processes_check_interval
+        Cfg.processes_check_interval
       end
     end
 

data/lib/monitors/restart_listener.rb

@@ -22,7 +22,7 @@ module Monitors
             $logger.info "Restarting process on port #{p.port}"
             Phantom::Manager.restart(p)
 
-            sleep $cfg.phantom_termination_grace
+            sleep Cfg.phantom_termination_grace
           end
 
         end

data/lib/monitors/violations_recorders/memory.rb

@@ -6,7 +6,7 @@ module Monitors
       class << self
 
         def retries_limit
-          $cfg.memory_retries
+          Cfg.memory_retries
         end
 
         def process_attr
@@ -14,7 +14,7 @@ module Monitors
         end
 
         def process_is_violating?(process)
-          process.memory_usage > $cfg.memory_limit
+          process.memory_usage > Cfg.memory_limit
         end
 
       end

data/lib/monitors/violations_recorders/processes.rb

@@ -5,7 +5,7 @@ module Monitors
     class Processes < Base
       class << self
         def retries_limit
-          $cfg.processes_check_retries
+          Cfg.processes_check_retries
         end
 
         def process_attr

data/lib/nginx/manager.rb

@@ -31,12 +31,12 @@ module Nginx
       end
 
       def port_defined?(port)
-        File.readlines($cfg.nginx_conf).grep(/#{port}/).size > 0
+        File.readlines(Cfg.nginx_conf).grep(/#{port}/).size > 0
       end
 
       def switch_nginx_configs
         $logger.info "switching nginx configurations"
-        `mv #{$cfg.new_nginx_conf} #{$cfg.nginx_conf}`
+        `mv #{Cfg.new_nginx_conf} #{Cfg.nginx_conf}`
       end
 
       def reload_nginx
@@ -45,8 +45,8 @@ module Nginx
       end
 
       def modify_nginx
-        File.open($cfg.new_nginx_conf, "w") do |ofile|
-          File.foreach($cfg.nginx_conf) do |iline|
+        File.open(Cfg.new_nginx_conf, "w") do |ofile|
+          File.foreach(Cfg.nginx_conf) do |iline|
             yield ofile, iline
           end
         end

data/lib/phantom/collector.rb

@@ -18,7 +18,7 @@ module Phantom
       end
 
       def required_ports
-        ($cfg.phantom_base_port..($cfg.phantom_base_port+$cfg.phantom_processes_number-1)).to_a
+        (Cfg.phantom_base_port..(Cfg.phantom_base_port+Cfg.phantom_processes_number-1)).to_a
       end
 
       private

data/lib/phantom/manager/version.rb

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

data/lib/phantom/manager.rb

@@ -24,7 +24,7 @@ module Phantom
       def stop(process)
         $logger.info "stopping process #{process}"
         Nginx::Manager.remove(process.port)
-        sleep $cfg.phantom_termination_grace
+        sleep Cfg.phantom_termination_grace
         process.kill
       end
 

data/lib/phantom/process.rb

@@ -47,7 +47,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} && phantomjs rndrme.js #{port} >>#{Cfg.phantom_log_path} 2>&1 &"
     end
 
   end

data/lib/utils/cfg.rb

@@ -2,17 +2,27 @@ require 'ostruct'
 require 'yaml'
 
 class Cfg
-  def self.load
-    cfg =  File.expand_path($options[:config])
-    env = $options[:env]
-    hash = YAML.load(File.open(cfg))[env]
-    hash.each do |k,v|
-      hash[k] = v.to_i if v =~ /^\d+$/
+  class << self
+
+    def method_missing(method_sym, *arguments, &block)
+      cfg.send(method_sym, *arguments, &block)
+    end
+     
+    def cfg
+      @cfg ||= Cfg.load
     end
-    obj = OpenStruct.new hash
-    obj.new_nginx_conf = "#{obj.nginx_conf}.new"
 
-    $cfg = obj
+    def load
+      cfg =  File.expand_path($options[:config])
+      env = $options[:env]
+      hash = YAML.load(File.open(cfg))[env]
+      hash.each do |k,v|
+        hash[k] = v.to_i if v =~ /^\d+$/
+      end
+      obj = OpenStruct.new hash
+      obj.new_nginx_conf = "#{obj.nginx_conf}.new"
+
+      @cfg = obj
+    end
   end
 end
-Cfg.load

data/spec/lib/monitors/memory_spec.rb

@@ -9,22 +9,22 @@ module Monitors
 
     before do
       Phantom::Collector.stub(:running_phantoms_shell_output).and_return(phantoms_ps_shell_output)
-      $cfg.memory_limit = 110000
-      $cfg.memory_retries = 3
+      Cfg.memory_limit = 110000
+      Cfg.memory_retries = 3
     end
 
     describe :perform_check do
       context "below memory_retries" do
         it "should not restart processes" do
           Phantom::Manager.should_not_receive(:restart)
-          ( $cfg.memory_retries - 1 ).times { subject.perform_check }
+          ( Cfg.memory_retries - 1 ).times { subject.perform_check }
         end
       end
 
       context "at memory_retries" do
         it "should restart process" do
           Phantom::Manager.should_receive(:restart).once
-          $cfg.memory_retries.times { subject.perform_check }
+          Cfg.memory_retries.times { subject.perform_check }
         end
       end
     end

data/spec/lib/monitors/processes_spec.rb

@@ -35,7 +35,7 @@ module Monitors
 
         it "should create two new instances" do
           Phantom::Manager.should_receive(:start).twice
-          $cfg.processes_check_retries.times {subject.perform_check}
+          Cfg.processes_check_retries.times {subject.perform_check}
         end
       end
 

data/spec/lib/monitors/violations_recorders/memory_spec.rb

@@ -13,8 +13,8 @@ module Monitors
 
       describe :is_violating? do
 
-        let(:violating_memory) { $cfg.memory_limit + 10}
-        let(:valid_memory) { $cfg.memory_limit - 10}
+        let(:violating_memory) { Cfg.memory_limit + 10}
+        let(:valid_memory) { Cfg.memory_limit - 10}
 
         context "violating process" do
 
@@ -24,7 +24,7 @@ module Monitors
           end
 
           it "should return true" do
-            ($cfg.memory_retries-1).times do
+            (Cfg.memory_retries-1).times do
               subject.is_violating?(@p).should be_false
             end
 
@@ -40,7 +40,7 @@ module Monitors
           end
 
           it "should return false" do
-            $cfg.memory_retries.times do
+            Cfg.memory_retries.times do
               subject.is_violating?(@p).should be_false
             end
           end
@@ -49,7 +49,7 @@ module Monitors
 
             it "reset violations if valid memory detected one" do
               @p.memory_usage = violating_memory
-              ($cfg.memory_retries-1).times do
+              (Cfg.memory_retries-1).times do
                 subject.is_violating?(@p).should be_false
               end
 
@@ -58,7 +58,7 @@ module Monitors
               subject.is_violating?(@p).should be_false
 
               @p.memory_usage = violating_memory
-              ($cfg.memory_retries-1).times do
+              (Cfg.memory_retries-1).times do
                 subject.is_violating?(@p).should be_false
               end
               subject.is_violating?(@p).should be_true

data/spec/lib/monitors/violations_recorders/processes_spec.rb

@@ -18,11 +18,11 @@ module Monitors
           Phantom::Collector.stub(:missing_ports).and_return([8004])
           @p = Phantom::Process.new
           @p.port = 8004
-          $cfg.processes_check_retries = 3
+          Cfg.processes_check_retries = 3
         end
 
         context "below retries limit" do
-          let(:retries) {$cfg.processes_check_retries - 1}
+          let(:retries) {Cfg.processes_check_retries - 1}
 
           it "should return false" do
             retries.times do
@@ -34,7 +34,7 @@ module Monitors
 
         context "equals retries limit" do
 
-          let(:retries) {$cfg.processes_check_retries}
+          let(:retries) {Cfg.processes_check_retries}
 
           it "should return false" do
             (retries-1).times do

data/spec/lib/nginx/manager_spec.rb

@@ -36,11 +36,11 @@ module Nginx
     subject {Manager}
 
     def port_defined?(port)
-      File.readlines($cfg.nginx_conf).grep(/#{port}/).size > 0
+      File.readlines(Cfg.nginx_conf).grep(/#{port}/).size > 0
     end
 
     before do
-      File.open($cfg.nginx_conf, "w") do |f|
+      File.open(Cfg.nginx_conf, "w") do |f|
         f.puts(INITIAL_CONF)
       end
 

data/spec/lib/phantom/collector_spec.rb

@@ -6,8 +6,8 @@ module Phantom
     subject {Collector}
 
     before do
-      $cfg.phantom_processes_number = 5
-      $cfg.phantom_base_port = 8002
+      Cfg.phantom_processes_number = 5
+      Cfg.phantom_base_port = 8002
       subject.stub(:running_phantoms_shell_output).and_return(phantoms_ps_shell_output)
     end
 

data/spec/lib/utils/cfg_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'utils/cfg'
+
+module Utils
+  describe Cfg do
+    subject {Cfg}
+
+    it "should be able to set" do
+      Cfg.rails_root= "some path"
+      Cfg.rails_root.should eq "some path"
+      Cfg.rails_root= "another path"
+      Cfg.rails_root.should eq "another path"
+    end
+  end
+end

data/spec/shared_spec.rb

@@ -1,7 +1,7 @@
 require 'utils/logger'
 require 'utils/cfg'
-$cfg.nginx_conf = File.expand_path('../files/nginx.conf', __FILE__)
-$cfg.new_nginx_conf = File.expand_path('../files/nginx.conf.new', __FILE__)
+Cfg.nginx_conf = File.expand_path('../files/nginx.conf', __FILE__)
+Cfg.new_nginx_conf = File.expand_path('../files/nginx.conf.new', __FILE__)
 
 $logger = Logger.new(nil)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phantom-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Erez Rabih
@@ -102,6 +102,7 @@ files:
 - spec/lib/phantom/collector_spec.rb
 - spec/lib/phantom/manager_spec.rb
 - spec/lib/phantom/process_spec.rb
+- spec/lib/utils/cfg_spec.rb
 - spec/lib/utils/limited_array_spec.rb
 - spec/lib/utils/lock_spec.rb
 - spec/lib/utils/shell_spec.rb
@@ -145,6 +146,7 @@ test_files:
 - spec/lib/phantom/collector_spec.rb
 - spec/lib/phantom/manager_spec.rb
 - spec/lib/phantom/process_spec.rb
+- spec/lib/utils/cfg_spec.rb
 - spec/lib/utils/limited_array_spec.rb
 - spec/lib/utils/lock_spec.rb
 - spec/lib/utils/shell_spec.rb