rubber 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec73202ff7ae4b8b7141a4628e7ab7d4b5e3d628
-  data.tar.gz: 1ed2f951bbd777e967b53185dd8fed1ae3692e5f
+  metadata.gz: f897442ad924496abcf7f3beeabfb592b0b5c7e9
+  data.tar.gz: e62e8386658cc1a20a8f32e0efa7113813b0166b
 SHA512:
-  metadata.gz: 040dedab057535bbb42a545bd2c77569153c7317530a8f118b879eef54596c74f6a619ba65cf1eced96b89a60bd6416d04f058e3a10f4520f2931f72712be9f7
-  data.tar.gz: b746357fc5923292cbd90fce4c05358598708caa33079f95a1509914ccd5367631ca9da9207b7bb14f694b2f9625cf09dfbb658317d35874d73a98c680134ae4
+  metadata.gz: d0dc0cd057ce461ee16d32d12c970c756cc9dd343e4f8e2861e08a1657131cba3777fe4449edcb964a5862caa8c445eca7f4e772bed94e3251290c9324fed2d2
+  data.tar.gz: 377e5688e2c403a57aee8c29de42057a679d31771f192bea842e46dd5f0d13f69439a29e478da8daacbd97ed45aaf6027fdb22e5ed85984e1fc64fd8f9a2b9dd

data/CHANGELOG

@@ -1,3 +1,28 @@
+2.6.2 (11/07/2013)
+
+Improvements:
+============
+
+[memcached]  Added configuration of max memcached memory size through rubber var 'memcached_max_mem'. <ba28c39>
+[cassandra] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[graphite] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[elasticsearch] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[graylog] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[jetty] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[mongrel] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[redis] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[sphinx] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[torquebox] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+[zookeeper] Quote all `rubber_env.host` in Monit config template in case hostname conflicts with monit keyword. <61bd9b1>
+
+Bug Fixes:
+=========
+
+[base] Fixed unknown method 'known_roles' when running create_staging. <44167c4>
+[core] Fixed ip_address deprecation for digital ocean.
+[core] Fixed a thread safety issue in Capistrano via a monkey-patch. <f3f9086>
+
+
 2.6.1 (11/06/2013)
 
 Improvements:
@@ -23,7 +48,7 @@ Improvements:
 ============
 
 [base] Upgraded to ruby-build 20131030 <214423d>
-[base]  Enhances database.yml to respond to active environment, not just 'production' <3843caf>
+[base] Enhances database.yml to respond to active environment, not just 'production' <3843caf>
 
 
 2.5.5 (10/16/2013)

data/lib/capistrano/thread_safety_fix.rb

@@ -0,0 +1,30 @@
+require 'capistrano/configuration'
+
+# Overrides a method in Capistrano::Configurations::Connections that has multiple threads writing to a shared hash.
+# While that shared hash is a thread local variable, they the thread is passed as an argument, so all the connection
+# threads are trying to update it at the same time.  This has been observed to cause problems where servers will end
+# up losing their connection objects, messing up all future SSH operations and eventually leading to an error about
+# calling a method on a nil object.
+#
+# We shouldn't make a habit of patching Capistrano in Rubber. But since Capistrano 2.x is effectively a dead project,
+# getting this fixed upstream is extremely unlikely.
+
+module Capistrano
+  class Configuration
+    private
+
+    MUTEX = Mutex.new
+
+    def safely_establish_connection_to(server, thread, failures=nil)
+      conn = connection_factory.connect_to(server)
+
+      MUTEX.synchronize do
+        thread[:sessions] ||= {}
+        thread[:sessions][server] ||= conn
+      end
+    rescue Exception => err
+      raise unless failures
+      failures << { :server => server, :error => err }
+    end
+  end
+end

data/lib/rubber/cloud/digital_ocean.rb

@@ -79,8 +79,8 @@ module Rubber
           instance[:id] = item.id
           instance[:state] = item.state
           instance[:type] = item.flavor_id
-          instance[:external_ip] = item.ip_address
-          instance[:internal_ip] = item.ip_address
+          instance[:external_ip] = item.public_ip_address
+          instance[:internal_ip] = item.public_ip_address
           instance[:region_id] = item.region_id
           instance[:provider] = 'digital_ocean'
           instance[:platform] = 'linux'

data/lib/rubber/recipes/rubber/volumes.rb

@@ -41,7 +41,15 @@ namespace :rubber do
 
     # The act of setting up volumes might blow away previously deployed code, so reset the update state so it can
     # be deployed again if needed.
-    set :rubber_code_was_updated, false
+    deploy_to = fetch(:deploy_to, nil)
+
+    unless deploy_to.nil?
+      deployed = capture("echo $(ls /var/run/reboot-required 2> /dev/null)")
+
+      unless deployed
+        set :rubber_code_was_updated, false
+      end
+    end
   end
 
   desc <<-DESC

data/lib/rubber/recipes/rubber.rb

@@ -5,6 +5,7 @@ require "socket"
 require 'resolv'
 require 'enumerator'
 require 'capistrano/hostcmd'
+require 'capistrano/thread_safety_fix'
 require 'pp'
 require 'rubber'
 

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.6.1"
+  VERSION = "2.6.2"
 end

data/templates/base/config/rubber/rubber.yml

@@ -266,7 +266,7 @@ stop_on_error_cmd: "function error_exit { exit 99; }; trap error_exit ERR"
 #
 # staging_roles: "web,app,db:primary=true"
 # Auto detect staging roles
-staging_roles: "#{rubber_env.known_roles.reject {|r| r =~ /slave/ || r =~ /^db$/ }.join(',')}"
+staging_roles: "#{known_roles.reject {|r| r =~ /slave/ || r =~ /^db$/ }.join(',')}"
 
 # OPTIONAL: Lets one assign amazon elastic IPs (static IPs) to your instances
 #           You should typically set this on the role/host level rather than

data/templates/cassandra/config/rubber/role/cassandra/monit-cassandra.conf

@@ -7,7 +7,7 @@ check process cassandra with pidfile <%= rubber_env.cassandra_pid_file %>
   group cassandra-<%= Rubber.env %>
   start program = "<%= rubber_env.cassandra_dir %>/bin/cassandra -p <%= rubber_env.cassandra_pid_file %>"
   stop program = "/bin/bash -l -c 'kill `cat <%= rubber_env.cassandra_pid_file %>`'"
-  #if failed host <%= rubber_env.host %> port <%= rubber_env.cassandra_rpc_port %> with timeout 10 seconds for 10 cycles then restart
+  #if failed host "<%= rubber_env.host %>" port <%= rubber_env.cassandra_rpc_port %> with timeout 10 seconds for 10 cycles then restart
 
 <% if Rubber.env == 'production' %>
 check filesystem commitlog_lv with path /mnt/cassandra/commitlog

data/templates/graphite/config/rubber/role/graphite_server/monit-graphite_server.conf

@@ -5,4 +5,4 @@ check process graphite_server with pidfile <%= rubber_env.graphite_server_pid_fi
   group graphite-<%= Rubber.env %>
   start program = "/usr/bin/env service graphite-server start"
   stop program = "/usr/bin/env service graphite-server stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.graphite_server_port %> with timeout 10 seconds for 3 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.graphite_server_port %> with timeout 10 seconds for 3 cycles then restart

data/templates/memcached/config/rubber/role/memcached/memcached.conf

@@ -6,7 +6,7 @@
 # memcached default config file edited for mobicious
 # 2003 - Jay Bonci <jaybonci@debian.org>
 # This configuration file is read by the start-memcached script provided as
-# part of the Debian GNU/Linux distribution. 
+# part of the Debian GNU/Linux distribution.
 
 # Run memcached as a daemon. This command is implied, and is not needed for the
 # daemon to run. See the README.Debian that comes with this package for more
@@ -25,10 +25,10 @@ logfile <%= rubber_env.memcached_log_dir %>/memcached.log
 # Start with a cap of 64 megs of memory. It's reasonable, and the daemon default
 # Note that the daemon will grow to this size, but does not start out holding this much
 # memory
--m 64
+-m <%= rubber_env.memcached_max_mem %>
 
 # Default connection port is 11211
--p 11211 
+-p 11211
 
 # Run the daemon as root. The start-memcached will default to running as root if no
 # -u command is present in this config file

data/templates/memcached/config/rubber/rubber-memcached.yml

@@ -1,6 +1,7 @@
 # Sets up memcached server and client as dalli
 
 memcached_log_dir: /var/log/memcached
+memcached_max_mem:  64
 
 gems: [dalli]
 

data/templates/monit/config/rubber/role/cassandra/monit-cassandra.conf

@@ -5,4 +5,4 @@ check process cassandra with pidfile <%= rubber_env.cassandra_pid_file %>
   group cassandra-<%= Rubber.env %>
   start program = "<%= rubber_env.cassandra_dir %>/bin/cassandra -p <%= rubber_env.cassandra_pid_file %>"
   stop program = "kill `cat <%= rubber_env.cassandra_pid_file %>`"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.cassandra_rpc_port %> with timeout 10 seconds for 10 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.cassandra_rpc_port %> with timeout 10 seconds for 10 cycles then restart

data/templates/monit/config/rubber/role/elasticsearch/monit-elasticsearch.conf

@@ -5,4 +5,4 @@ check process elasticsearch with pidfile <%= rubber_env.elasticsearch_pid_file %
   group elasticsearch-<%= Rubber.env %>
   start program = "/usr/bin/env service elasticsearch start"
   stop program = "/usr/bin/env service elasticsearch stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.elasticsearch_http_port %> with timeout 10 seconds for 10 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.elasticsearch_http_port %> with timeout 10 seconds for 10 cycles then restart

data/templates/monit/config/rubber/role/graphite_server/monit-graphite_server.conf

@@ -5,4 +5,4 @@ check process graphite_server with pidfile <%= rubber_env.graphite_server_pid_fi
   group graphite-<%= Rubber.env %>
   start program = "/usr/bin/env service graphite-server start"
   stop program = "/usr/bin/env service graphite-server stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.graphite_server_port %> with timeout 10 seconds for 3 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.graphite_server_port %> with timeout 10 seconds for 3 cycles then restart

data/templates/monit/config/rubber/role/graylog_server/monit-graylog_server.conf

@@ -5,4 +5,4 @@ check process graylog_server with pidfile <%= rubber_env.graylog_server_pid_file
   group graylog-<%= Rubber.env %>
   start program = "/usr/bin/env service graylog-server start"
   stop program = "/usr/bin/env service graylog-server stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.graylog_server_port %> type UDP with timeout 10 seconds for 10 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.graylog_server_port %> type UDP with timeout 10 seconds for 10 cycles then restart

data/templates/monit/config/rubber/role/graylog_web/monit-graylog_web.conf

@@ -5,4 +5,4 @@ check process graylog_web with pidfile <%= rubber_env.graylog_web_pid_file %>
   group graylog-<%= Rubber.env %>
   start program = "/usr/bin/env service graylog-web start"
   stop program = "/usr/bin/env service graylog-web stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.graylog_web_port %> with timeout 10 seconds for 10 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.graylog_web_port %> with timeout 10 seconds for 10 cycles then restart

data/templates/monit/config/rubber/role/jetty/monit-jetty.conf

@@ -5,4 +5,4 @@ check process jetty with pidfile /var/run/jetty.pid
   group jetty-<%= Rubber.env %>
   start program = "<%= rubber_env.jetty_dir %>/bin/jetty.sh start"
   stop program = "<%= rubber_env.jetty_dir %>/bin/jetty.sh stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.jetty_port %> with timeout 10 seconds for 10 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.jetty_port %> with timeout 10 seconds for 10 cycles then restart

data/templates/monit/config/rubber/role/mongrel/monit-mongrel.conf

@@ -16,5 +16,5 @@
     stop program = "/bin/sh -c 'cd <%= Rubber.root %> && PATH=/usr/local/bin:$PATH && mongrel_rails cluster::stop --clean --only <%= port %> && sleep 30 && mongrel_rails cluster::stop --clean --force --only <%= port %>'"
     if totalmem > 200.0 MB for 3 cycles then restart
     <%# monit needs to test on same same interface that mongrel is listening on (see mongrel_cluster.yml) %>
-    if failed host <%= rubber_env.host %> port <%= port %> protocol http with timeout 10 seconds for 10 cycles then restart
+    if failed host "<%= rubber_env.host %>" port <%= port %> protocol http with timeout 10 seconds for 10 cycles then restart
 <% end %>

data/templates/monit/config/rubber/role/redis/monit-redis.conf

@@ -5,4 +5,4 @@ check process redis with pidfile <%= rubber_env.redis_server_pid_file %>
   group redis-<%= Rubber.env %>
   start program = "/usr/bin/env service redis-server start"
   stop program = "/usr/bin/env service redis-server stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.redis_server_port %> with timeout 10 seconds for 10 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.redis_server_port %> with timeout 10 seconds for 10 cycles then restart

data/templates/monit/config/rubber/role/sphinx/monit-sphinx.conf

@@ -10,4 +10,4 @@ check process sphinx with pidfile <%= pidfile %>
   group sphinx-<%= Rubber.env %>
   start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= start_program %>'"
   stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> bash -l -c '<%= stop_program %>'"
-  if failed host <%= rubber_env.host %> port 9312 with timeout 5 seconds for 5 cycles then restart
+  if failed host "<%= rubber_env.host %>" port 9312 with timeout 5 seconds for 5 cycles then restart

data/templates/torquebox/config/rubber/role/torquebox/monit-torquebox.conf

@@ -5,4 +5,4 @@ check process torquebox with pidfile <%= rubber_env.torquebox_pid_file %>
   group torquebox-<%= Rubber.env %>
   start program = "/usr/bin/env service torquebox start"
   stop program = "/usr/bin/env service torquebox stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.torquebox_http_port %> with timeout 10 seconds for 20 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.torquebox_http_port %> with timeout 10 seconds for 20 cycles then restart

data/templates/zookeeper/config/rubber/role/zookeeper/monit-zookeeper.conf

@@ -5,4 +5,4 @@ check process zookeeper with pidfile <%= rubber_env.zookeeper_pid_file %>
   group zookeeper-<%= Rubber.env %>
   start program = "/usr/bin/env service zookeeper start"
   stop program = "/usr/bin/env service zookeeper stop"
-  if failed host <%= rubber_env.host %> port <%= rubber_env.zookeeper_client_port %> with timeout 10 seconds for 10 cycles then restart
+  if failed host "<%= rubber_env.host %>" port <%= rubber_env.zookeeper_client_port %> with timeout 10 seconds for 10 cycles then restart

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -205,6 +205,7 @@ files:
 - TODO
 - bin/rubber
 - lib/capistrano/hostcmd.rb
+- lib/capistrano/thread_safety_fix.rb
 - lib/rubber.rb
 - lib/rubber/capistrano.rb
 - lib/rubber/cli.rb