haproxyctl 1.0.0 → 1.1.0

data/LICENSE

@@ -1,7 +1,8 @@
 Copyright (C) 2010-2012 
 author: Carlo Flores <github@petalphile.com>
 contributors: Scott Gonyea, John A. Barbuto, Ben Lovett, 
-  Till Klampaeckel, Erik Osterman, Martin Hald, DeniedBoarding
+  Till Klampaeckel, Erik Osterman, Martin Hald, DeniedBoarding,
+  Aaron Blew, Nick Griffiths
 
 Permission is hereby granted, free of charge, to any person obtaining 
 a copy of this software and associated documentation files (the 

data/README.md

@@ -50,7 +50,7 @@ usage: ./haproxyctl <argument>
     prompt: toggle interactive mode with prompt
     quit: disconnect
     show info: report information about the running process
-    show stat: report counters for each proxy and server
+    show stat [counter...]: report counters for each proxy and server
     show errors: report last request and response errors for each proxy
     show sess [id]: report the list of current sessions or dump this session
     get weight: report a server's current weight
@@ -221,8 +221,36 @@ Examples
   ssh,localhost,0,0,0,3,,122,54524,291662,,0,,0,0,0,0,UP,1,1,0,0,0,2144680,0,,1,7,1,,122,,2,0,,10,L4OK,,0,0,121,0,1,0,0,0,,,,0,0,
   ssh,BACKEND,0,0,0,3,0,122,54524,291662,0,0,,0,0,0,0,UP,1,1,0,,0,2144680,0,,1,7,0,,122,,1,0,,10,,,,0,121,0,1,0,0,,,,,0,0,
 </pre>
-  
-## More additions: Enables or disables a target server from every backend it appears.  
+### Extends stat command to print only counters supplied as arguments
+<pre>
+  ./haproxyctl "show stat qcur qmax"
+  http,FRONTEND,,
+  sinatra,sinatra_downoi,0,0
+  sinatra,sinatra_rindica,0,0
+  sinatra,sinatra_guinea,0,0
+  sinatra,BACKEND,0,0
+  ei,guinea,0,0
+  ei,belem,0,0
+  ei,BACKEND,0,0
+  drop,guinea,0,0
+  drop,belem,0,0
+  drop,BACKEND,0,0
+  apache,guinea,0,0
+  apache,belem,0,0
+  apache,BACKEND,0,0
+  static,ngnix_downoi,0,0
+  static,ngnix_petite,0,0
+  static,ngnix_rindica,0,0
+  static,nginx_stellatus,0,0
+  static,nginx_belem,0,0
+  static,nginx_petite,0,0
+  static,apache_guinea,0,0
+  static,BACKEND,0,0
+  ssh,localhost,0,0
+  ssh,BACKEND,0,0
+</pre>
+
+## Enable or disable a target server from every backend it appears.
 <pre>
   ./haproxyctl "show health"
   # pxname        svname               status  weight
@@ -306,9 +334,6 @@ Examples
 Contributors
 ------------
 
-Ordered by date of first contribution.
-[Auto-generated](http://github.com/dtrejo/node-authors) on Thu Aug 16 2012 15:45:25 GMT-0700 (PDT).
-
 - [flores aka `flores`](https://github.com/flores)
 - [Scott Gonyea aka `sgonyea`](https://github.com/sgonyea)
 - [Ben Lovett aka `blovett`](https://github.com/blovett)
@@ -317,6 +342,8 @@ Ordered by date of first contribution.
 - [Erik Osterman aka `osterman`](https://github.com/osterman)
 - [Martin Hald aka `mhald`](https://github.com/mhald)
 - [deniedboarding](https://github.com/deniedboarding)
+- [Aaron Blew aka `blewa`](https://github.com/blewa)
+- [Nick Griffiths aka `nicobrevin`](https://github.com/nicobrevin)
 
 License
 -----------------

data/bin/haproxyctl

@@ -144,6 +144,21 @@ begin
         end
       end
     end
+  when /show stat (.+)/
+    fieldnames=$1
+    status=unixsock("show stat")
+    indices = fieldnames.split(" ").map do |name|
+      status.first.split(',').index(name) || begin
+        $stderr.puts("no such field: #{name}")
+        $stderr.puts("  #{status.first}")
+        exit 1
+      end
+    end
+    status[1..-1].each do |line|
+      row = line.split(',')
+      filtered = indices.map {|index| row[index] }
+      puts (row[0...2] + filtered).compact.join(',')
+    end
   when /enable all (.+)/
     servername=$1
     status=unixsock("show stat")

data/haproxyctl

@@ -144,6 +144,21 @@ begin
         end
       end
     end
+  when /show stat (.+)/
+    fieldnames=$1
+    status=unixsock("show stat")
+    indices = fieldnames.split(" ").map do |name|
+      status.first.split(',').index(name) || begin
+        $stderr.puts("no such field: #{name}")
+        $stderr.puts("  #{status.first}")
+        exit 1
+      end
+    end
+    status[1..-1].each do |line|
+      row = line.split(',')
+      filtered = indices.map {|index| row[index] }
+      puts (row[0...2] + filtered).compact.join(',')
+    end
   when /enable all (.+)/
     servername=$1
     status=unixsock("show stat")

data/install-haproxy/haproxy_src_install.sh

@@ -6,6 +6,7 @@
 # quick and dirty (but sometimes handy) installer.
 #
 
+HAPROXYVER="1.4.23"
 STARTINGDIR=$PWD
 
 # make sure we have make, pcre and junk
@@ -30,7 +31,7 @@ fi
 # grab last stable.  HAProxy's site versions nicely - these will still be here after the next update
 mkdir /usr/local/src || echo "Oops, /usr/local/src exists!"
 cd /usr/local/src || exit 2
-wget http://haproxy.1wt.eu/download/1.4/src/haproxy-1.4.20.tar.gz
+wget http://haproxy.1wt.eu/download/1.4/src/haproxy-$HAPROXYVER.tar.gz
 
 # get rid of an existing haproxy
 if [ -e /usr/local/haproxy ]; then
@@ -38,14 +39,16 @@ if [ -e /usr/local/haproxy ]; then
 fi
 
 # check the checksum
-MD5CHECK=`md5sum /usr/local/src/haproxy-1.4.20.tar.gz |awk '{print $1}'`
-if [ "$MD5CHECK" != "0cd3b91812ff31ae09ec4ace6355e29e" ] ; then
+MD5CHECK=`md5sum /usr/local/src/haproxy-$HAPROXYVER.tar.gz |awk '{print $1}'`
+if [ "$MD5CHECK" != "6535d5e58037ada4b58b439cebe03c79" ] ; then
         echo -e "MD5s do not match!\nBailing.";
         exit 2;
 fi
 
-tar xvfz haproxy-1.4.20.tar.gz
-cd haproxy-1.4.20
+tar xvfz haproxy-$HAPROXYVER.tar.gz
+rm haproxy-$HAPROXYVER.tar.gz
+
+cd haproxy-$HAPROXYVER
 
 if uname -a | grep x86_64 ; then
 	make TARGET=linux26 CPU=x86_64 USE_PCRE=1
@@ -63,8 +66,8 @@ ln -s /usr/local/sbin/haproxy /usr/sbin/haproxy
 
 # grab carlo's haproxyctl script/init
 cd /usr/local
-if [ -e /usr/local/haproxy ]; then
-  cd haproxy;
+if [ -e /usr/local/haproxyctl ]; then
+  cd haproxyctl;
   git pull;
 else
   git clone https://github.com/flores/haproxyctl.git

data/lib/haproxyctl/environment.rb

@@ -38,7 +38,7 @@ module HAProxyCTL
 
     def socket
       @socket ||= begin
-        config.match /stats socket \s*([^\s]*)/
+        config.match /stats\s+socket \s*([^\s]*)/
         $1 || raise("Expecting 'stats socket <UNIX_socket_path>' in #{config_path}")
       end
     end

data/lib/haproxyctl/version.rb

@@ -1,3 +1,3 @@
 module HAProxyCTL
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,34 +1,28 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: haproxyctl
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Carlo Flores
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-11 00:00:00 -07:00
-default_executable: 
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies: []
-
-description: This is a simple wrapper to make life with HAProxy a little more convenient. Acts as an init script for start, stop, reload, restart, etc. Leverages 'socket' to enable and disable servers on the fly. Formats server weight and backends in a readable way. Provides Nagios and Cloudkick health checks. Compatible with RHEL chkconfig/service.
-email: 
+description: This is a simple wrapper to make life with HAProxy a little more convenient.
+  Acts as an init script for start, stop, reload, restart, etc. Leverages 'socket'
+  to enable and disable servers on the fly. Formats server weight and backends in
+  a readable way. Provides Nagios and Cloudkick health checks. Compatible with RHEL
+  chkconfig/service.
+email:
 - github@petalphile.com
-executables: 
+executables:
 - haproxyctl
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -59,39 +53,29 @@ files:
 - rhapr/spec/spec_helper.rb
 - rhapr/spec/support/config_fixtures.rb
 - rhapr/spec/support/custom_matchers.rb
-has_rdoc: true
 homepage: https://github.com/flores/haproxyctl
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: haproxyctl
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Wrapper to talk to the HAProxy socket, as well as regular init (start|stop|status|etc)
 test_files: []
-