varnish_rest_api_client 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ba51d5172663dc68a4bf0a1ca29883d8cc16cd
-  data.tar.gz: 375d574acd8915382eebcb1a96d107225b6638dd
+  metadata.gz: 5422fec6eb4cfd662bf62146794fd8524064f194
+  data.tar.gz: d4ee559a0ff5b37f10c191c65ed3c12f9d49ef3f
 SHA512:
-  metadata.gz: a5053587081577812e0f440d18511078a76021e7f3f0de174fd6fdd559c339b6922cba55603065651720436e07c3f9a073bc096c92c78c41f9e5f763e3e9e7aa
-  data.tar.gz: 491c905d6b2b6840b3d691fa72ca9908a5c73293cb91ea6ca388cc8a8774ed7b016c7d72a7a2e555ac3ac766d56079028f5b6238d4b3bbe8b9d2a75cdb57730c
+  metadata.gz: 1862b7be7601f34e66bd0b24f2e7509748298b437960d3a5b2b416c3c89f31e972b9febb2cc5002e149e6633721ecb90210b42feef8a5a7b0dcaa2062f5ac4b3
+  data.tar.gz: ce3004f6c2806e9aaddc525bbc7051f06edb52339bea1055b3c2b6e7d4ca0f49d9338a0880059815b5cc50f5b38aaad36aa04ab1c582b632c3770031f163ecae

data/lib/varnish_rest_api_client/client.rb

@@ -8,7 +8,7 @@ module VarnishRestApiClient
 
 class Client < Thor
   class_option :varnish, :aliases => "V", :desc => "varnish server(s)", :type => :array
-  class_option :zkserver, :aliases => "z", :desc => "zookeeper server:port", :default => "autodeploy38-2:2181"
+  class_option :zkserver, :aliases => "z", :desc => "zookeeper server:port", :default => "autodeploy.mobile.rz:2181"
   class_option :zkpath, :aliases => "P", :desc => "zookeeper varnish root path", :default => "/varnish"
 
   # alternate use invoke
@@ -25,18 +25,12 @@ class Client < Thor
 
   desc "out BACKEND", "set health of this varnish BACKEND to sick."
     def out(backend) 
-      @nodes.each do |api|
-        p = call_rest(api)
-        puts p.call("#{backend}/out")
-      end      
+      set_health(backend,"out")
     end
     
   desc "in BACKEND", "set health of this varnish BACKEND to auto"
     def in(backend)
-      @nodes.each do |api|
-        p = call_rest(api)
-        puts p.call("#{backend}/in")
-      end
+      set_health(backend,"in")
     end
     
   desc "show", "show varnish hosts registered with zookeeper"
@@ -45,24 +39,38 @@ class Client < Thor
     end
   
   desc "list PATTERN", "display all varnish backends"
-    def list(pattern=nil)      
-      backends_found = Array.new      
-        @nodes.each do |api|           
-          uri = pattern ?  "list/#{pattern}" : "list"      
-          p = call_rest(api)
-          result = p.call(uri)          
-          next if result.empty?          
-          if result.first.class != Hash
-             puts "error from #{api}: #{result}"
-          end
-          
-          backends_found << result
-        end
-           puts backends_found.empty? ? "no backends found for pattern #{pattern}" : backends_found         
+    def list(pattern=nil) 
+      backends_found = list_backends(pattern)
+      puts backends_found.empty? ? "no backends found for pattern #{pattern}" : backends_found         
    end
     
    no_commands do 
      
+    def set_health(backend,action)
+      @varnishes =  list_backends(backend).collect { |varnish| varnish['varnishhost']}      
+      $stderr.puts "no backends found for pattern \"#{backend}\"" if @varnishes.empty?          
+      @varnishes.each do |api|
+        p = call_rest(api)
+        puts p.call("#{backend}/#{action}")
+      end  
+    end
+     
+    def list_backends(pattern=nil)      
+       backends_found = Array.new      
+         @nodes.each do |api|           
+           uri = pattern ?  "list/#{pattern}" : "list"      
+           p = call_rest(api)
+           result = p.call(uri)          
+           next if result.empty?          
+           if result.first.class != Hash
+              puts "error from #{api}: #{result}"
+           end
+           
+           backends_found << result
+         end
+            backends_found.empty? ? [] : backends_found.flatten         
+    end
+     
     def use_zookeeper
        if options[:varnish].nil? || options[:varnish].empty?
          return true
@@ -95,32 +103,17 @@ class Client < Thor
         begin          
          buffer = open("http://#{node}/#{action}").read
          result = JSON.parse(buffer)
-         result.collect! { |e| e["varnishhost"] = node ; e  } 
+         result.collect! { |e| e["varnishhost"] = node ; e } 
         rescue SocketError => e
          abort "problem connecting rest api at #{node}: #{e.message}"
         rescue OpenURI::HTTPError => e
+          response = e.io
+          $stderr.puts response.string
          abort "problem calling rest api at #{node}: #{e.message}"
         end
       end
     end
-    
-    def call_restb(url,node_name) 
-      begin          
-       buffer = open(url).read
-       result = JSON.parse(buffer)
-       result.collect! { |e| e["varnishhost"] = node_name ; e  } 
-      rescue SocketError => e
-       abort "problem connecting rest api at #{url}: #{e.message}"
-      rescue OpenURI::HTTPError => e
-       abort "problem calling rest api at #{url}: #{e.message}"
-      end
-      if block_given?
-        yield result
-      else
-        result
-      end
-    end
-    
+        
    end
     
 end

data/lib/varnish_rest_api_client/version.rb

@@ -1,3 +1,3 @@
 module VarnishRestApiClient
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: varnish_rest_api_client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jonathan Colby
@@ -138,8 +138,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A command line client for the varnish rest api.
 test_files: []
+has_rdoc: