bipbip 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 433fdde4a9b2144a2a91baae4db5cbaa8be7c1aa
-  data.tar.gz: 5c4dd948262df1f2316671762f79ec736b3af8f4
+  metadata.gz: e4f44ff5a912f62505175131fc84b775583b58f1
+  data.tar.gz: 944a75282d428af5e347fc08a3cc8812a8db2ef9
 SHA512:
-  metadata.gz: 5a5e22ca08f87579060db60e031c86316ded9b2f8eeba1cec4735e0d4778084ad9ce381e15d47dc13dff3f3e2bcd864f8e0e12970977613f5dbf7b9d37afe7c5
-  data.tar.gz: b1754c55a86c4eb27baa658a73654e91f43c83495019fcf50c96baac5dd674f52460198192c2ad5ac34a8de9b91510f585a5bc6ce157ed98b3e3dbc528a838d0
+  metadata.gz: 21e998fc4160e95dbc1222b50bfdcd337f7041dfcf37ad651f25ce6de3633902c894d88c3d55be23dfb47c69729d3c5b22f1eeb94a44baaf350d7ec292988896
+  data.tar.gz: 2dd70820ae7dcb8b2760ee33c2a6762031ed1a7a912f8ca5c8a49c33dd70aa215d8c9bb50c6a9a948903aa82e7dc8a65f47f0ca1aba1809e62349aec3c46b7e9

data/README.md

@@ -56,7 +56,9 @@ services:
     url: http://localhost:80/server-status
   -
     plugin: php-fpm
-    url: http://localhost:80/status?json
+    host: localhost
+    port: 9000
+    path: /fpm-status
   -
     plugin: network
   -
@@ -81,6 +83,9 @@ port: 11211
 
 Plugins
 ----------------------------
+#### php-fpm
+Requires the `cgi-fcgi` program (debian package: `libfcgi0ldbl`).
+
 #### php-apc
 To collect `APC` stats of your apache process, please install the following script.
 

data/lib/bipbip.rb

@@ -6,6 +6,7 @@ module Bipbip
   require 'json/pure'
   require 'logger'
   require 'socket'
+  require 'shellwords'
 
   require 'interruptible_sleep'
 

data/lib/bipbip/plugin/php_fpm.rb

@@ -11,11 +11,20 @@ module Bipbip
     end
 
     def monitor
-      uri = URI.parse(config['url'])
-      response = Net::HTTP.get_response(uri)
-      raise "Invalid response from server at #{config['url']}" unless response.code == '200'
+      authority = config['host'].to_s + ':' + config['port'].to_s
+      path = config['path'].to_s
 
-      status = JSON.parse(response.body)
+      env_backup = ENV.to_hash
+      ENV['REQUEST_METHOD'] = 'GET'
+      ENV['SCRIPT_NAME'] = path
+      ENV['SCRIPT_FILENAME'] = path
+      ENV['QUERY_STRING'] = 'json'
+      response = `cgi-fcgi -bind -connect #{authority.shellescape} 2>&1`
+      ENV.replace(env_backup)
+
+      body = response.split(/\r?\n\r?\n/)[1]
+      raise "FastCGI response has no body: #{response}" unless body
+      status = JSON.parse(body)
 
       status.reject{|k, v| !metrics_names.include?(k)}
     end

data/lib/bipbip/version.rb

@@ -1,3 +1,3 @@
 module Bipbip
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bipbip
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Cargo Media
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: copperegg