phantom-manager 0.0.9 → 0.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YThlMjc4YTBhNmVhYTVmM2Q2MzE1OGM0NDM2Mjc2OGM3MDMwZTM0OA==
-  data.tar.gz: !binary |-
-    OTVmZDA5MTBhZTk1ZjFiMjA3NDI5ZmEzMjZmNjlhMTc0YjlmNDFiZA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NDAyZGI0Mjk4ZDMzYTBkMWEzYWYyYWI5ZjY0MWMyYzA1NTNlMjMyZmUyZjg4
-    YzU1ODM4ZDRkOThlYWIxNzgyM2M0NGY5NWZkNzgxMTYzNjE5NjIzZGQyY2Q4
-    ZWYxNjE1NzE5ZTlkMDIzYjQ3Mjc2MzA4NTA3NzQ0ZjY3MDY1Yjk=
-  data.tar.gz: !binary |-
-    NTVmM2IzY2Y3NzNhNmRlOGNlNTUzYmJhNTBlYzg5NDE2MWEzYmRiNWExZmM2
-    YWRhYTM2Y2RmMzkzNTVlNThlYmYwZDVmNmU5OTQ3MzYwYzdlNDhmYjEyMmE3
-    MWE3YWM2Yjc0MWFmZWViYTc1ZTU1ZDg5OTkzM2Y5ZGJlZjQxMDU=
+SHA1:
+  metadata.gz: 4b2140ec2eec956b9273c449c25321ffaf9c3cbf
+  data.tar.gz: 998ce63f7932722b8bf05ad6fe68a2abf0e23167
+SHA512:
+  metadata.gz: 04a3bc245f665307e9828957c69b446476227e2cddaaa1218546a2112bda5fc4ae47c2fd03327d3e9066cf05277fbde33d8355c3c6e16dca757657105466884d
+  data.tar.gz: 7116937194fa9ccfb9e0a40c7edc8e9c6dc788495fccc03500bb2110a2ac8b2cad10d97cfb2b744dbda6f53f30607fb021abfc8a10ca939da5d2d086ece82bf3

data/Gemfile

@@ -3,6 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in phantom-manager.gemspec
 gemspec
 
-gem 'rspec'
-gem 'debugger'
 

data/Gemfile.lock

@@ -1,36 +1,27 @@
 PATH
   remote: .
   specs:
-    phantom-manager (0.0.8)
+    phantom-manager (0.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    columnize (0.3.6)
-    debugger (1.4.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.2.0)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.2.0)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     rake (10.1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.3)
-    rspec-expectations (2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.1)
+    rspec-mocks (2.14.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
-  debugger
   phantom-manager!
-  rake
-  rspec
+  rake (= 10.1.0)
+  rspec (= 2.14.1)

data/config/config.yml

@@ -38,3 +38,4 @@ development:
   response_time_check_interval: 40
   response_time_check_host: 'localhost'
   response_time_check_path: '/'
+  response_check_phrase: "Test is OK"

data/lib/monitors/violations_recorders/response_time.rb

@@ -15,21 +15,23 @@ module Monitors
 
         def process_is_violating?(process)
           time = Cfg.response_time_threshold 
+          phrase = nil
           begin 
             Timeout.timeout(Cfg.response_time_threshold) do 
-              time = check_response_time(process)
+              response = get_response(process)
+              time = response.split("***").last.to_f
+              phrase = response.match(Cfg.response_check_phrase)
             end
           rescue Timeout::Error
             return true
           end
-          time > Cfg.response_time_threshold
+          ( time > Cfg.response_time_threshold ) || !(phrase)
         end
 
         private
 
-        def check_response_time(process)
-          res = `curl -o /dev/null -s -w %{time_total}@%{http_code} --header "X-Backend-Host: #{Cfg.response_time_check_host}" --header "X-Phantom: true" #{process_url(process)}`
-          res.split("@").first.to_f
+        def get_response(process)
+          `curl -s -w "***%{time_total}" --header "X-Backend-Host: #{Cfg.response_time_check_host}" --header "X-Phantom: true" #{process_url(process)}`
         end
 
         def process_url(process)

data/lib/phantom/manager/version.rb

@@ -1,5 +1,5 @@
 module Phantom
   module Manager
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/phantom-manager.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake", '10.1.0'
+  spec.add_development_dependency "rspec", '2.14.1'
 end

data/spec/files/config.yml

@@ -11,3 +11,4 @@ test:
   processes_check_retries: 3
   processes_check_interval: 15
   phantom_command: 'phantomjs config/phantomjs/rndrme.js'
+  response_check_phrase: "Test is OK"

data/spec/files/nginx.conf

@@ -1,27 +1,29 @@
-upstream unicorn {
-  server 127.0.0.1:8001;
-}
+      upstream unicorn {
+        server 127.0.0.1:8001;
+      }
 
-upstream phantomjs {
-  server 127.0.0.1:8003 fail_timeout=0; # 2013-12-31 16:03:00 +0200
-  server 127.0.0.1:8002;
-  server 127.0.0.1:8004;
-  server 127.0.0.1:8005;
-  server 127.0.0.1:8006;
-  server 127.0.0.1:8007;
-  server 127.0.0.1:8008;
-  server 127.0.0.1:8009;
-  server 127.0.0.1:8010;
-  server 127.0.0.1:8011;
-}
+      upstream phantomjs {
+        server 127.0.0.1:8012;
+        server 127.0.0.1:8013;
+        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;
+        server 127.0.0.1:8007;
+        server 127.0.0.1:8008;
+        server 127.0.0.1:8009;
+        server 127.0.0.1:8010;
+        server 127.0.0.1:8011;
+      }
 
-server {
-  server_name _
+      server {
+        server_name _;
 
-  location / {
-    proxy_pass http://phantomjs;
-  }
-  blah
-  bli
-  omo
-}
+        location / {
+          proxy_pass http://phantomjs;
+        }
+        blah
+        bli
+        omo
+      }

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

@@ -18,7 +18,7 @@ module Monitors
 
         context "timeout" do
           before do
-            subject.stub(:check_response_time).and_raise(Timeout::Error)
+            subject.stub(:get_response).and_raise(Timeout::Error)
           end
 
           it "should return true" do
@@ -28,7 +28,7 @@ module Monitors
 
         context "fast response time" do
           before do
-            subject.stub(:check_response_time).and_return(RESPONSE_TIME_THRESHOLD - 1)
+            subject.stub(:get_response).and_return("<!DOCTYPE html><html><head>\n</head>\n<body id=\"test\">Test is OK \n\n\n</body></html>***#{RESPONSE_TIME_THRESHOLD - 1}")
           end
 
           it "should return false" do
@@ -38,13 +38,32 @@ module Monitors
 
         context "slow response time" do
           before do
-            subject.stub(:check_response_time).and_return(RESPONSE_TIME_THRESHOLD + 1)
+            subject.stub(:get_response).and_return("<!DOCTYPE html><html><head>\n</head>\n<body id=\"test\">Test is OK \n\n\n</body></html>***#{RESPONSE_TIME_THRESHOLD + 1}")
           end
 
           it "should return true" do
             subject.process_is_violating?(stub).should be_true
           end
         end
+
+        context "phrase not matching" do
+          before do
+            subject.stub(:get_response).and_return("<!DOCTYPE html><html><head>\n</head>\n<body id=\"test\"> \n\n\n</body></html>***#{RESPONSE_TIME_THRESHOLD - 1}")
+          end
+
+          it "should return true" do
+            subject.process_is_violating?(stub).should be_true
+          end
+        end
+        context "phrase matching" do
+          before do
+            subject.stub(:get_response).and_return("<!DOCTYPE html><html><head>\n</head>\n<body id=\"test\">Test is OK \n\n\n</body></html>***#{RESPONSE_TIME_THRESHOLD - 1}")
+          end
+
+          it "should return true" do
+            subject.process_is_violating?(stub).should be_false
+          end
+        end
       end
 
     end

data/spec/spec_helper.rb

@@ -14,6 +14,42 @@ $options[:config] = File.expand_path("../files/config.yml", __FILE__)
 
 require 'shared_spec'
 
+def reset_nginx_conf
+  File.open(File.expand_path("../files/nginx.conf", __FILE__), "w") do |f|
+    f.write <<-END
+      upstream unicorn {
+        server 127.0.0.1:8001;
+      }
+
+      upstream phantomjs {
+        server 127.0.0.1:8012;
+        server 127.0.0.1:8013;
+        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;
+        server 127.0.0.1:8007;
+        server 127.0.0.1:8008;
+        server 127.0.0.1:8009;
+        server 127.0.0.1:8010;
+        server 127.0.0.1:8011;
+      }
+
+      server {
+        server_name _;
+
+        location / {
+          proxy_pass http://phantomjs;
+        }
+        blah
+        bli
+        omo
+      }
+    END
+  end
+end
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
@@ -27,4 +63,7 @@ RSpec.configure do |config|
 
   require 'utils/shell'
   config.before(:each)  { Utils::Shell.stub(:system) }
+
+  config.before(:suite) { reset_nginx_conf }
+  config.after(:suite) { reset_nginx_conf }
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: phantom-manager
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Erez Rabih
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.14.1
 description: Uses Nginx as multiple phantomjs workers load balancer
 email:
 - erez.rabih@gmail.com
@@ -60,8 +60,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .DS_Store
-- .gitignore
+- ".DS_Store"
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -89,7 +89,6 @@ files:
 - lib/utils/limited_array.rb
 - lib/utils/lock.rb
 - lib/utils/logger.rb
-- lib/utils/rndrme.js
 - lib/utils/shell.rb
 - phantom-manager.gemspec
 - spec/files/config.yml
@@ -123,17 +122,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Write a gem summary

data/lib/utils/rndrme.js

@@ -1,111 +0,0 @@
-var config = {
-  host: "http://localhost:8001",
-  maxTime: 30000,
-  maxBytes: 0x100000,
-  readyEvent: "renderReady",
-  loadImages: false
-}
-
-
-var system    = require("system")
-var webserver = require("webserver")
-var webpage   = require("webpage")
-
-var port = system.args[1];
-
-if (!port) {
-  console.error("No port specified in " + configPath)
-  phantom.exit(1)
-}
-
-var server    = webserver.create()
-var listening = server.listen(port, onRequest)
-
-if (!listening) {
-  console.error("Could not bind to port " + port)
-  phantom.exit(1)
-}
-
-function onRequest(req, res) {
-  var page          = webpage.create()
-  var bytesConsumed = 0
-
-  if (req.method != "GET") {
-    return send(405, toHTML("Method not accepted."))
-  }
-
-  var url = parse(req.url)
-
-  var query = url.query
-  var href = decodeURIComponent(config.host + req.url)
-
-  if (!href) {
-    return send(400, toHTML("`href` parameter is missing."))
-  }
-
-  var maxTime    = Number(query.max_time)  || config.maxTime
-  var maxBytes   = Number(query.max_bytes) || config.maxBytes
-  var readyEvent = query.ready_event       || config.readyEvent
-  var loadImages = "load_images" in query  || config.loadImages
-
-  page.settings.loadImages = loadImages
-
-  page.onInitialized = function() {
-    page.evaluate(onInit, readyEvent)
-
-    function onInit(readyEvent) {
-      window.rndrme = true;
-      window.addEventListener(readyEvent, function() {
-        setTimeout(window.callPhantom, 0)
-      })
-    }
-  }
-
-  page.onCallback = function() {
-    send(200, page.content)
-  }
-
-  var timeout = setTimeout(page.onCallback, maxTime)
-
-  console.log("(" + port + ") opening page " + href);
-
-  page.open(href)
-
-  function send(statusCode, data) {
-    clearTimeout(timeout)
-
-    res.statusCode = statusCode
-
-    res.setHeader("Content-Type", "text/html")
-    res.setHeader("Content-Length", byteLength(data))
-    res.setHeader("X-Rndrme-Bytes-Consumed", bytesConsumed.toString())
-
-    res.write(data)
-    res.close()
-
-    page.close()
-  }
-}
-
-function byteLength(str) {
-  return encodeURIComponent(str).match(/%..|./g).length
-}
-
-function toHTML(message) {
-  return "<!DOCTYPE html><body>" + message + "</body>\n"
-}
-
-function parse(url) {
-  var anchor = document.createElement("a")
-
-  anchor.href = url
-  anchor.query = {}
-
-  anchor.search.slice(1).split("&").forEach(function(pair) {
-    pair = pair.split("=").map(decodeURIComponent)
-    anchor.query[pair[0]] = pair[1]
-  })
-
-  return anchor
-}
-