rubber 2.2.3 → 2.2.4

data/CHANGELOG

@@ -1,3 +1,11 @@
+2.2.4 (03/05/2013)
+------------------
+
+Bug Fixes:
+=========
+[mysql] Reverted the service status check since it returns a success status code even if MySQL isn't running.
+
+
 2.2.3 (03/04/2013)
 ------------------
 

data/lib/rubber/recipes/rubber/utils.rb

@@ -59,13 +59,17 @@ namespace :rubber do
   desc <<-DESC
     Live tail of rails log files for all machines
     By default tails the rails logs for the current RUBBER_ENV, but one can
-    set FILE=/path/file.*.glob to tails a different set
+    set FILE=/path/file.*.glob to tail a different set
   DESC
   task :tail_logs, :roles => :app do
+    last_host = ""
     log_file_glob = rubber.get_env("FILE", "Log files to tail", true, "#{current_path}/log/#{Rubber.env}*.log")
+    trap("INT") { puts 'Exiting...'; exit 0; }                    # handle ctrl-c gracefully
     run "tail -qf #{log_file_glob}" do |channel, stream, data|
-      puts  # for an extra line break before the host name
-      puts data
+      puts if channel[:host] != last_host                         # blank line between different hosts
+      host = "[#{channel.properties[:host].gsub(/\..*/, '')}]"    # get left-most subdomain
+      data.lines { |line| puts "%-15s %s" % [host, line] }        # add host name to the start of each line
+      last_host = channel[:host]
       break if stream == :err
     end
   end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.2.3"
+  VERSION = "2.2.4"
 end

data/templates/mysql/config/rubber/deploy-mysql.rb

@@ -134,7 +134,7 @@ namespace :rubber do
       Starts the mysql daemons
     DESC
     task :start, :roles => [:mysql_master, :mysql_slave] do
-      rsudo "service mysql status || service mysql start"
+      rsudo "service mysql start"
     end
     
     desc <<-DESC

data/templates/mysql_cluster/config/rubber/deploy-mysql_cluster.rb

@@ -122,7 +122,7 @@ namespace :rubber do
       Starts the mysql cluster sql daemon on the sql nodes
     DESC
     task :start_sql, :roles => :mysql_sql do
-      rsudo "service mysql status || service mysql start"
+      rsudo "service mysql start"
     end
     
     desc <<-DESC

data/templates/percona/config/rubber/deploy-percona.rb

@@ -147,7 +147,7 @@ namespace :rubber do
       Starts the mysql daemons
     DESC
     task :start, :roles => [:percona_master, :percona_slave] do
-      rsudo "service mysql status || service mysql start"
+      rsudo "service mysql start"
     end
     
     desc <<-DESC

data/templates/torquebox/config/rubber/deploy-torquebox.rb

@@ -105,8 +105,6 @@ namespace :rubber do
       rsudo "service torquebox status || service torquebox start"
     end
 
-    after "deploy:restart", "rubber:torquebox:reload"
-
     desc "Reloads the apache web server"
     task :reload, :roles => :torquebox do
       serial_reload

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease:
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano