varnish_rest_api 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 257782b52b58db707a6330a99a8f1f2197881442
-  data.tar.gz: 480ff4c9e4fddede1735059ba08ee6f84a9d250c
+  metadata.gz: fc483ffa3d099a1aaa36e97a531166ce2cca5d89
+  data.tar.gz: 4e5058f0d5d020039359d9b652a7b5da90df14bb
 SHA512:
-  metadata.gz: 1484ef7ef74ac4d1f8378fb7188cdaa0bba946240800692d44f7e5b971bdc529f3d843104e2f55189f89c5314533a5ece3dec06102ec1e5d04bca07be9669eeb
-  data.tar.gz: bc063d7ed2b5403c9cefdbbf306a6691ecf6a3bb48c3dffc2f14c078afdd665384933fcb3b50ba6ccd94e0775d4beb6c9b8d0f8a9dbbf99b5df1944bd933b721
+  metadata.gz: f0516cd42b16afb7b3edcdccb272809d14f0501f79ece82bbc54ad0406f6cd21b4d670c6c8195a52834e761a90d33ff68783c6365fd1e9c31da333ba69b4530d
+  data.tar.gz: dbb0bc09595e5bbae8018a74c80a490f706959adbed6f6d99d6cca3745c6178cbf788aa8f06d9ca682f18708a7a33551e7bcecfffcd866d8d9fa32c81a959322

data/.gitignore

@@ -1,6 +1,6 @@
 /.bundle/
 /.yardoc
-#/Gemfile.lock
+/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/lib/varnish_rest_api.rb

@@ -46,6 +46,7 @@ config_default = {
 config = config_default.merge!(config_file)
 
 varnish = VarnishBase.new(:instance => config[:instance], \
+  :port => config[:port], \
   :zookeeper_host => config[:zookeeper_host], \
   :use_zookeeper => config[:use_zookeeper], \
   :zookeeper_basenode => config[:zookeeper_basenode], \

data/lib/varnish_rest_api/varnish_base.rb

@@ -5,11 +5,11 @@ require 'ostruct'
 require 'zk'
 require 'socket'
 
-
 class VarnishBase
 
   def initialize(params = {})
     @mgmt_port = params.fetch(:mgmt_port, 6082)
+    @port = params.fetch(:port, 4567)
     @mgmt_host = params.fetch(:mgmt_host, 'localhost')
     @instance = params.fetch(:instance, 'default')
     @use_zookeeper = params.fetch(:use_zookeeper, false)
@@ -30,10 +30,13 @@ class VarnishBase
           abort "problem connecting to zookeeper host: #{@zookeeper_host}"
       end
         
-      begin         
-        @zk.create(@zookeeper_basenode + '/' + @hostname, @hostname, :mode => :ephemeral_sequential)
+      begin  
+        node = @zookeeper_basenode + '/' + @hostname  
+        # if the node exists, delete it since it is probably not from our zk session  
+        @zk.delete(node,:ignore => [:no_node,:not_empty,:bad_version])  
+        @zk.create(node,"#{@hostname}:#{@port}", :mode => :ephemeral_sequential, :ignore => [:no_node,:not_empty,:bad_version])
       rescue ZK::Exceptions::NoNode => zke
-        @zk.create(@zookeeper_basenode,'', :mode => :persistent)
+        $stderr.puts "something went wrong creating the zookeeper node #{node}: " + zke.message
       end
     end
     

data/lib/varnish_rest_api/version.rb

@@ -1,3 +1,3 @@
 module VarnishRestApi
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: varnish_rest_api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -106,8 +106,6 @@ files:
 - ".buildpath"
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
-- Gemfile.orig
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -140,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 sinatra rest api for varnish.
 test_files: []
+has_rdoc: 

data/Gemfile.lock

@@ -1,58 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    daemons (1.2.2)
-    eventmachine (1.0.7)
-    ffi (1.9.8)
-    hitimes (1.2.2)
-    json (1.8.2)
-    listen (2.9.0)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    little-plugger (1.1.3)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
-    mime-types (2.4.3)
-    multi_json (1.11.0)
-    netrc (0.10.3)
-    rack (1.6.0)
-    rack-protection (1.5.3)
-      rack
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rerun (0.10.0)
-      listen (~> 2.7, >= 2.7.3)
-    rest-client (1.7.3)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    thin (1.6.3)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
-      rack (~> 1.0)
-    tilt (1.4.1)
-    timers (4.0.1)
-      hitimes
-    zk (1.9.5)
-      logging (~> 1.8.2)
-      zookeeper (~> 1.4.0)
-    zookeeper (1.4.10)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  json
-  rerun
-  rest-client
-  sinatra
-  thin
-  zk

data/Gemfile.orig

@@ -1,12 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'json'
-gem 'rest-client'
-gem 'sinatra'
-gem 'zk'
-
-group :development do
-    gem 'rerun'
-    gem 'thin'
-end
-