le1t0-deprec 2.1.6.068 → 2.1.6.069

data/lib/deprec/recipes/memcache.rb

@@ -1,14 +1,52 @@
-# Copyright 2006-2008 by Mike Bailey. All rights reserved.
+# Copyright 2006-2008 by Mike Bailey, 2011 by le1t0. All rights reserved.
 Capistrano::Configuration.instance(:must_exist).load do 
   namespace :deprec do
     namespace :memcache do
       
-      set :memcache_ip, 'INDRR_ANY'
-      set :memcache_port, 11211
-      set :memcache_memory, 64
-      set :memcache_factor, 1.25
-      set :memcache_minsize, 48
-      set :memcache_conn, 1024
+      set :memcache_ip, nil # -l ... -- memcached default is 'INDRR_ANY'
+      set :memcache_port, nil # -p ... -- memcached default is '11211'
+      set(:memcache_udp_port) { memcache_port } # -U ... -- defaults to memcache_port -- memcached default is '11211'
+      set :memcache_memory, nil # -m ... -- memcached default is '64'
+      set :memcache_factor, nil # -f ... -- memcached default is '1.25'
+      set :memcache_minsize, nil # -n ... -- memcached default is '48'
+      set :memcache_conn, nil # -c ... -- memcached default is '1024'
+      set :memcache_run_as, nil # -u ...
+      set :memcache_key_id_delim, nil # -D ... -- memcached default is ':'
+      set :memcache_threads, nil # -t ... -- memcached default is '4'
+      set :memcache_reqs_per_event, nil # -R ... -- memcached default is '20'
+      set :memcache_backlog_queue_limit, nil # -b ... -- memcached default is '1024'
+      set :memcache_binding_protocol, nil # -B auto|binary|ascii -- memcached default is 'auto'
+      set :memcache_slab_page_size, nil # -I [1k..128m] -- memcached default is '1m'
+      set :memcache_max_core_file_limit, false # -r -- memcached default is <not enabled>
+      set :memcache_error_on_mem_exhausted, false # -M -- memcached default is <not enabled>
+      set :memcache_lock_down_paged_mem, false # -k -- memcached default is <not enabled>
+      set :memcache_large_memory_pages, false # -L -- memcached default is <not enabled>
+      set :memcache_no_cas, false # -C -- memcached default is to use CAS
+      
+      MEMCACHED_BOOLEAN_OPTIONS = {
+        :memcache_no_cas => :C
+        :memcache_large_memory_pages => :L,
+        :memcache_lock_down_paged_mem => :k,
+        :memcache_error_on_mem_exhausted => :M,
+        :memcache_max_core_file_limit => :r
+      }
+      
+      MEMCACHED_VALUE_OPTIONS = {
+        :memcache_ip => :l,
+        :memcache_port => :p,
+        :memcache_udp_port => :U,
+        :memcache_memory => :m,
+        :memcache_factor => :f,
+        :memcache_minsize => :n,
+        :memcache_conn => :c,
+        :memcache_run_as => :u,
+        :memcache_key_id_delim => :D,
+        :memcache_threads => :t,
+        :memcache_reqs_per_event => :R,
+        :memcache_backlog_queue_limit => :b,
+        :memcache_binding_protocol => :B,
+        :memcache_slab_page_size => :I
+      }
   
       SYSTEM_CONFIG_FILES[:memcache] = [
     

data/lib/deprec/templates/memcache/memcache-init.d

@@ -1,36 +1,61 @@
 #!/bin/sh
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+<%
+
+boolean_arguments = MEMCACHED_BOOLEAN_OPTIONS.collect do |name, opt|
+  if fetch(name)
+		"-#{opt}"
+	end
+end.compact.join(' ')
+
+value_arguments = MEMCACHED_VALUE_OPTIONS.collect do |name, opt|
+  if (value=fetch(name))
+		"-#{opt} #{value}"
+	end
+end.compact.join(' ')
+
+arguments = [ [ "-d", "-P $PIDFILE" ], boolean_arguments, value_arguments ].flatten.join(' ')
+
+%>PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/local/bin/memcached
-DAEMONBOOTSTRAP=/usr/local/share/memcached/scripts/start-memcached
 NAME=memcached
 DESC=memcached
 PIDFILE=/var/run/$NAME.pid
 
 test -x $DAEMON || exit 0
-test -x $DAEMONBOOTSTRAP || exit 0
 
 set -e
 
+start () {
+    start-stop-daemon --start --quiet --exec $DAEMON -- <%= arguments %>
+}
+
+stop () {
+    start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
+    rm -f $PIDFILE
+}
+
+restart () {
+	stop
+	sleep 1
+	start
+}
+
 case "$1" in
     start)
         echo -n "Starting $DESC: "
-        start-stop-daemon --start --quiet --exec $DAEMONBOOTSTRAP -- -d -m <%= memcache_memory %> -l <%= memcache_ip %> -p <%= memcache_port %> -f <%= memcache_factor %> -s <%= memcache_minsize %> -c <%= memcache_conn %>
+		start
         echo "$NAME."
         ;;
     stop)
         echo -n "Stopping $DESC: "
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
+		stop
         echo "$NAME."
-        rm -f $PIDFILE
         ;;
 
     restart|force-reload)
         echo -n "Restarting $DESC: "
-        start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE
-        rm -f $PIDFILE
-        sleep 1
-        start-stop-daemon --start --quiet --exec $DAEMONBOOTSTRAP
+		restart
         echo "$NAME."
         ;;
     *)

metadata

@@ -2,7 +2,7 @@
 name: le1t0-deprec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.6.068
+  version: 2.1.6.069
 platform: ruby
 authors: 
 - Le1t0