lacquer 0.5.6 → 0.5.7

data/lib/generators/lacquer/templates/varnishd.yml

@@ -1,26 +1,28 @@
-development:
-  listen: 127.0.0.1:3001
-  telnet: 127.0.0.1:6082
-  backend: 127.0.0.1:3000
-  sbin_path: /usr/local/sbin
-  storage: "file,#{Rails.root}/log/varnishd.#{Rails.env}.cache,100MB"
-    
-test:
-  listen: 127.0.0.1:3002
-  telnet: 127.0.0.1:6083
-  backend: 127.0.0.1:3000
-  sbin_path: /usr/local/sbin
-  storage: "file,#{Rails.root}/log/varnishd.#{Rails.env}.cache,100MB"
-
-production:
-  listen: :80
-  telnet: localhost:6082
-  backend: backend_server:8080
-  sbin_path: /usr/local/sbin
-  storage: "file,#{Rails.root}/log/varnishd.#{Rails.env}.cache,100MB"
-  params:
-    overflow_max: 2000          # for Varnish 2.x ... use "queue_max: 2000" for Varnish 3.x
-    thread_pool_add_delay: 2
-    thread_pools: 4             # <Number of cpu cores>
-    thread_pool_min: 200        # <800/number of cpu cores>
-    thread_pool_max: 4000
+development:
+  listen: 127.0.0.1:3001
+  telnet: 127.0.0.1:6082
+  backend: 127.0.0.1:3000
+  sbin_path: /usr/local/sbin
+  storage: "file,#{Rails.root}/log/varnishd.#{Rails.env}.cache,100MB"
+    
+test:
+  listen: 127.0.0.1:3002
+  telnet: 127.0.0.1:6083
+  backend: 127.0.0.1:3000
+  sbin_path: /usr/local/sbin
+  storage: "file,#{Rails.root}/log/varnishd.#{Rails.env}.cache,100MB"
+
+production:
+  listen: :80
+  telnet: localhost:6082
+  backend: backend_server:8080
+  use_sudo: false
+  sbin_path: /usr/local/sbin
+  pid_path: <%= Rails.root.join('log') %>
+  storage: "file,#{Rails.root}/log/varnishd.#{Rails.env}.cache,100MB"
+  params:
+    overflow_max: 2000          # for Varnish 2.x ... use "queue_max: 2000" for Varnish 3.x
+    thread_pool_add_delay: 2
+    thread_pools: 4             # <Number of cpu cores>
+    thread_pool_min: 200        # <800/number of cpu cores>
+    thread_pool_max: 4000

data/lib/lacquer/configuration.rb

@@ -26,6 +26,9 @@ module Lacquer
     # Pass Command (in vcl_fetch)
     attr_accessor :pass_command
 
+    # Use sudo for start up
+    attr_accessor :use_sudo
+
     def initialize
       @enable_cache = true
       @varnish_servers = []
@@ -35,6 +38,7 @@ module Lacquer
       @command_error_handler = nil
       @purge_command = "url.purge"
       @pass_command = "pass"
+      @use_sudo = false
     end
 
     # Returns a hash of all configurable options

data/lib/lacquer/varnishd.rb

@@ -1,6 +1,6 @@
 module Lacquer
   class Varnishd
-    attr_accessor :listen, :telnet, :sbin_path, :storage, :working_dir, :user, :backend, :params
+    attr_accessor :listen, :telnet, :sbin_path, :storage, :working_dir, :user, :backend, :params, :use_sudo, :pid_path
 
     cattr_accessor :started_check_delay, :vcl_script_filename
     self.started_check_delay = 1
@@ -23,8 +23,8 @@ module Lacquer
     end
 
     def initialize(settings = self.class.config)
-      self.listen, self.telnet, self.backend, self.sbin_path, self.storage, self.working_dir, self.user, self.params =
-        settings.values_at("listen", "telnet", "backend", "sbin_path", "storage", "working_dir", "user", "params")
+      self.listen, self.telnet, self.backend, self.sbin_path, self.storage, self.working_dir, self.user, self.params, self.use_sudo, self.pid_path =
+        settings.values_at("listen", "telnet", "backend", "sbin_path", "storage", "working_dir", "user", "params", "use_sudo", "pid_path")
     end
 
     def render_vcl
@@ -55,7 +55,7 @@ module Lacquer
 
     def stop
       if running?
-        execute("kill #{pid}")
+        execute("#{'sudo ' if use_sudo}kill #{pid}")
         pid_file.delete
       else
         log("pid file not found or varnishd not running")
@@ -63,9 +63,7 @@ module Lacquer
     end
 
     def running?
-      !!pid && !!Process.kill(0, pid.to_i)
-    rescue
-      false
+      !!pid && !!execute("ps p #{pid}").include?(pid.to_s) # works with sudo
     end
 
     def args
@@ -95,11 +93,19 @@ module Lacquer
     protected
 
     def varnishd_cmd
-      Pathname.new(sbin_path).join('varnishd')
+      "#{'sudo ' if use_sudo}#{Pathname.new(sbin_path).join('varnishd')}"
     end
 
     def pid_file
-      self.class.root_path.join("log/varnishd.#{self.class.env}.pid")
+      pid_computed_path.join("varnishd.#{self.class.env}.pid")
+    end
+
+    def pid_computed_path
+      if self.pid_path
+        Pathname.new self.pid_path
+      else
+        self.class.root_path.join('log/')
+      end
     end
 
     def vcl_script_filename

data/lib/lacquer/version.rb

@@ -1,3 +1,3 @@
 module Lacquer
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

data/spec/config/varnishd.yml

@@ -6,5 +6,6 @@ test:
   storage: "file,#{Rails.root}/log/varnish,1GB"
   working_dir: ""
   user: "deploy"
+  use_sudo: true
   params:
     overflow_max: 2000

data/spec/lacquer/varnishd_spec.rb

@@ -27,6 +27,7 @@ describe "Varnishd" do
     Lacquer::Varnishd.config.should have_key("telnet")
     Lacquer::Varnishd.config.should have_key("sbin_path")
     Lacquer::Varnishd.config.should have_key("storage")
+    Lacquer::Varnishd.config.should have_key("use_sudo")
     Lacquer::Varnishd.config["params"].should have_key('overflow_max')
   end
 
@@ -35,11 +36,21 @@ describe "Varnishd" do
     Lacquer::Varnishd.new("sbin_path" => "/opt/varnishd/sbin").start
   end
 
+  it "returns full path to varnishd using sudo" do
+    executes_with(%r[sudo /opt/varnishd/sbin/varnishd])
+    Lacquer::Varnishd.new("sbin_path" => "/opt/varnishd/sbin", "use_sudo" => true).start
+  end
+
   it "returns pid file" do
     executes_with(/log\/varnishd.test.pid/)
     Lacquer::Varnishd.new("sbin_path" => "/opt/varnishd/sbin").start
   end
 
+  it "returns pid file with custom path" do
+    executes_with(/pid\/varnishd.test.pid/)
+    Lacquer::Varnishd.new("sbin_path" => "/opt/varnishd/sbin", "pid_path" => "pid/").start
+  end
+
   it "returns params as string" do
     Lacquer::Varnishd.new("params" => { "max" => 2000, "add" => 2 }).params_args.should == "-p max=2000 -p add=2"    
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lacquer
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70253394615980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,15 @@ dependencies:
         version: 2.3.10
   type: :runtime
   prerelease: false
-  version_requirements: *70253394615980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.10
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70253394614860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -35,10 +40,15 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70253394614860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &70253394613740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +56,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253394613740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70253394612340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +72,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253394612340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70253394610860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -68,10 +88,15 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70253394610860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70253394610320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,7 +104,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253394610320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails drop in for Varnish support.
 email: russ@bashme.org
 executables: []
@@ -146,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: lacquer
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Rails drop in for Varnish support.