gizzmo 0.3.5 → 0.4.1

data/.gitignore

@@ -20,4 +20,5 @@ pkg
 
 ## PROJECT::SPECIFIC
 tmp
-gizzmo.log
+gizzmo.log
+*.gem

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.4.1

data/gizzmo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gizzmo}
-  s.version = "0.3.5"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Maxwell"]
-  s.date = %q{2010-07-26}
+  s.date = %q{2010-07-29}
   s.default_executable = %q{gizzmo}
   s.description = %q{Gizzmo is a command-line client for managing gizzard clusters.}
   s.email = %q{kmaxwell@twitter.com}

data/lib/gizzard/commands.rb

@@ -2,11 +2,13 @@ require "pp"
 module Gizzard
   class Command
     include Thrift
-    
+
     attr_reader :buffer
 
-    def self.run(command_name, service, global_options, argv, subcommand_options)
-      command = Gizzard.const_get("#{classify(command_name)}Command").new(service, global_options, argv, subcommand_options)
+    def self.run(command_name, global_options, argv, subcommand_options, log)
+      command_class = Gizzard.const_get("#{classify(command_name)}Command")
+      service = command_class.make_service(global_options, log)
+      command = command_class.new(service, global_options, argv, subcommand_options)
       command.run
       if command.buffer && command_name = global_options.render.shift
         run(command_name, service, global_options, command.buffer, OpenStruct.new)
@@ -28,18 +30,30 @@ module Gizzard
     def help!(message = nil)
       raise HelpNeededError, message
     end
-    
+
     def output(string)
       if global_options.render.any?
         @buffer ||= []
         @buffer << string.strip
-      else 
+      else
         puts string
       end
     end
   end
 
-  class AddforwardingCommand < Command
+  class ShardCommand < Command
+    def self.make_service(global_options, log)
+      Gizzard::Thrift::ShardManager.new(global_options.host, global_options.port, log, global_options.dry)
+    end
+  end
+
+  class JobCommand < Command
+    def self.make_service(global_options, log)
+      Gizzard::Thrift::JobManager.new(global_options.host, global_options.port + 2, log, global_options.dry)
+    end
+  end
+
+  class AddforwardingCommand < ShardCommand
     def run
       help! if argv.length != 3
       table_id, base_id, shard_id_text = argv
@@ -48,7 +62,24 @@ module Gizzard
     end
   end
 
-  class ForwardingsCommand < Command
+  class DeleteforwardingCommand < ShardCommand
+    def run
+      help! if argv.length != 3
+      table_id, base_id, shard_id_text = argv
+      shard_id = ShardId.parse(shard_id_text)
+      service.remove_forwarding(Forwarding.new(table_id.to_i, base_id.to_i, shard_id))
+    end
+  end
+
+  class HostsCommand < ShardCommand
+    def run
+      service.list_hostnames.map do |host|
+        puts host
+      end
+    end
+  end
+  
+  class ForwardingsCommand < ShardCommand
     def run
       service.get_forwardings().sort_by do |f|
         [ ((f.table_id.abs << 1) + (f.table_id < 0 ? 1 : 0)), f.base_id ]
@@ -60,7 +91,7 @@ module Gizzard
     end
   end
 
-  class SubtreeCommand < Command
+  class SubtreeCommand < ShardCommand
     def run
       @roots = []
       argv.each do |arg|
@@ -81,7 +112,7 @@ module Gizzard
         links.map { |link| roots_of(link.up_id) }.flatten
       end
     end
-    
+
     def down(id, depth = 0)
       service.list_downward_links(id).map do |link|
         printable = "  " * depth + link.down_id.to_unix
@@ -91,7 +122,7 @@ module Gizzard
     end
   end
 
-  class ReloadCommand < Command
+  class ReloadCommand < ShardCommand
     def run
       if global_options.force || ask
         service.reload_forwardings
@@ -106,7 +137,7 @@ module Gizzard
     end
   end
 
-  class DeleteCommand < Command
+  class DeleteCommand < ShardCommand
     def run
       argv.each do |arg|
         id  = ShardId.parse(arg)
@@ -116,7 +147,7 @@ module Gizzard
     end
   end
 
-  class AddlinkCommand < Command
+  class AddlinkCommand < ShardCommand
     def run
       up_id, down_id, weight = argv
       help! if argv.length != 3
@@ -129,7 +160,7 @@ module Gizzard
     end
   end
 
-  class UnlinkCommand < Command
+  class UnlinkCommand < ShardCommand
     def run
       up_id, down_id = argv
       up_id = ShardId.parse(up_id)
@@ -138,7 +169,7 @@ module Gizzard
     end
   end
 
-  class UnwrapCommand < Command
+  class UnwrapCommand < ShardCommand
     def run
       shard_ids = argv
       help! "No shards specified" if shard_ids.empty?
@@ -158,20 +189,23 @@ module Gizzard
     end
   end
 
-  class CreateCommand < Command
+  class CreateCommand < ShardCommand
     def run
-      help! if argv.length != 3
-      host, table, class_name = argv
+      help! if argv.length < 2
+      class_name, *shard_ids = argv
       busy = 0
       source_type = command_options.source_type || ""
       destination_type = command_options.destination_type || ""
-      service.create_shard(ShardInfo.new(shard_id = ShardId.new(host, table), class_name, source_type, destination_type, busy))
-      service.get_shard(shard_id)
-      output shard_id.to_unix
+      shard_ids.each do |id|
+        shard_id = ShardId.parse(id)
+        service.create_shard(ShardInfo.new(shard_id, class_name, source_type, destination_type, busy))
+        service.get_shard(shard_id)
+        output shard_id.to_unix
+      end
     end
   end
 
-  class LinksCommand < Command
+  class LinksCommand < ShardCommand
     def run
       shard_ids = @argv
       shard_ids.each do |shard_id_text|
@@ -186,7 +220,7 @@ module Gizzard
     end
   end
 
-  class InfoCommand < Command
+  class InfoCommand < ShardCommand
     def run
       shard_ids = @argv
       shard_ids.each do |shard_id|
@@ -196,7 +230,7 @@ module Gizzard
     end
   end
 
-  class WrapCommand < Command
+  class WrapCommand < ShardCommand
     def self.derive_wrapper_shard_id(shard_info, wrapping_class_name)
       prefix_prefix = wrapping_class_name.split(".").last.downcase.gsub("shard", "") + "_"
       ShardId.new("localhost", prefix_prefix + shard_info.id.table_prefix)
@@ -223,7 +257,7 @@ module Gizzard
     end
   end
 
-  class FindCommand < Command
+  class FindCommand < ShardCommand
     def run
       help!("host is a required option") unless command_options.shard_host
       service.shards_for_hostname(command_options.shard_host).each do |shard|
@@ -233,7 +267,7 @@ module Gizzard
     end
   end
 
-  class LookupCommand < Command
+  class LookupCommand < ShardCommand
     def run
       table_id, source_id = @argv
       help!("Requires table id and source id") unless table_id && source_id
@@ -241,4 +275,102 @@ module Gizzard
       output shard.id.to_unix
     end
   end
+
+  class CopyCommand < ShardCommand
+    def run
+      from_shard_id_string, to_shard_id_string = @argv
+      help!("Requires source & destination shard id") unless from_shard_id_string && to_shard_id_string
+      from_shard_id = ShardId.parse(from_shard_id_string)
+      to_shard_id = ShardId.parse(to_shard_id_string)
+      service.copy_shard(from_shard_id, to_shard_id)
+    end
+  end
+
+  class BusyCommand < ShardCommand
+    def run
+      service.get_busy_shards().each { |shard_info| output shard_info.to_unix }
+    end
+  end
+
+  class SetupMigrateCommand < ShardCommand
+    def run
+      from_shard_id_string, to_shard_id_string = @argv
+      help!("Requires source & destination shard id") unless from_shard_id_string && to_shard_id_string
+      from_shard_id = ShardId.parse(from_shard_id_string)
+      to_shard_id = ShardId.parse(to_shard_id_string)
+
+      if service.list_upward_links(to_shard_id).size > 0
+        STDERR.puts "Destination shard #{to_shard_id} has links to it."
+        exit 1
+      end
+
+      write_only_shard_id = ShardId.new("localhost", "#{to_shard_id.table_prefix}_migrate_write_only")
+      replica_shard_id = ShardId.new("localhost", "#{to_shard_id.table_prefix}_migrate_replica")
+      service.create_shard(ShardInfo.new(write_only_shard_id, "com.twitter.gizzard.shards.WriteOnlyShard", "", "", 0))
+      service.create_shard(ShardInfo.new(replica_shard_id, "com.twitter.gizzard.shards.ReplicatingShard", "", "", 0))
+      service.add_link(write_only_shard_id, to_shard_id, 1)
+      service.list_upward_links(from_shard_id).each do |link|
+        service.remove_link(link.up_id, link.down_id)
+        service.add_link(link.up_id, replica_shard_id, link.weight)
+      end
+      service.add_link(replica_shard_id, from_shard_id, 1)
+      service.add_link(replica_shard_id, write_only_shard_id, 0)
+      service.replace_forwarding(from_shard_id, replica_shard_id)
+      output replica_shard_id.to_unix
+    end
+  end
+
+  class FinishMigrateCommand < ShardCommand
+    def run
+      from_shard_id_string, to_shard_id_string = @argv
+      help!("Requires source & destination shard id") unless from_shard_id_string && to_shard_id_string
+      from_shard_id = ShardId.parse(from_shard_id_string)
+      to_shard_id = ShardId.parse(to_shard_id_string)
+
+      write_only_shard_id = ShardId.new("localhost", "#{to_shard_id.table_prefix}_migrate_write_only")
+      replica_shard_id = ShardId.new("localhost", "#{to_shard_id.table_prefix}_migrate_replica")
+
+      # careful. need to validate some basic assumptions.
+      unless global_options.force
+        if service.list_upward_links(from_shard_id).map { |link| link.up_id }.to_a != [ replica_shard_id ]
+          STDERR.puts "Uplink from #{from_shard_id} is not a migration replica."
+          exit 1
+        end
+        if service.list_upward_links(to_shard_id).map { |link| link.up_id }.to_a != [ write_only_shard_id ]
+          STDERR.puts "Uplink from #{to_shard_id} is not a write-only barrier."
+          exit 1
+        end
+        if service.list_upward_links(write_only_shard_id).map { |link| link.up_id }.to_a != [ replica_shard_id ]
+          STDERR.puts "Uplink from write-only barrier is not a migration replica."
+          exit 1
+        end
+      end
+
+      service.remove_link(write_only_shard_id, to_shard_id)
+      service.list_upward_links(replica_shard_id).each do |link|
+        service.remove_link(link.up_id, link.down_id)
+        service.add_link(link.up_id, to_shard_id, link.weight)
+      end
+      service.replace_forwarding(replica_shard_id, to_shard_id)
+      service.delete_shard(replica_shard_id)
+      service.delete_shard(write_only_shard_id)
+    end
+  end
+
+  class InjectCommand < JobCommand
+    def run
+      priority, *jobs = @argv
+      help!("Requires priority") unless priority and jobs.size > 0
+      count = 0
+      jobs.each do |job|
+        service.inject_job(priority.to_i, job)
+        count += 1
+        # FIXME add -q --quiet option
+        STDERR.print "."
+        STDERR.print "#{count}" if count % 100 == 0
+        STDERR.flush
+      end
+      STDERR.print "\n"
+    end
+  end
 end

data/lib/gizzard/thrift.rb

@@ -86,7 +86,7 @@ module Gizzard
       end
     end
 
-    class ShardManager < T::ThriftService
+    class GizzmoService < T::ThriftService
       def initialize(host, port, log_path, dry_run = false)
         super(host, port)
         @dry = dry_run
@@ -122,8 +122,9 @@ module Gizzard
         ts = timestamp ? "#{Time.now}\t" : ""
         "#{ts}#{method_name}(#{args.map{|a| a.inspect}.join(', ')})"
       end
+    end
 
-
+    class ShardManager < GizzmoService
       thrift_method :create_shard, void, field(:shard, struct(ShardInfo), 1), :throws => exception(ShardException)
       thrift_method :delete_shard, void, field(:id, struct(ShardId), 1)
       thrift_method :get_shard, struct(ShardInfo), field(:id, struct(ShardId), 1)
@@ -141,6 +142,7 @@ module Gizzard
 
       thrift_method :set_forwarding, void, field(:forwarding, struct(Forwarding), 1)
       thrift_method :replace_forwarding, void, field(:old_id, struct(ShardId), 1), field(:new_id, struct(ShardId), 2)
+      thrift_method :remove_forwarding, void, field(:forwarding, struct(Forwarding), 1)
 
       thrift_method :get_forwarding, struct(Forwarding), field(:table_id, i32, 1), field(:base_id, i64, 2)
       thrift_method :get_forwarding_for_shard, struct(Forwarding), field(:shard_id, struct(ShardId), 1)
@@ -152,8 +154,20 @@ module Gizzard
 
       thrift_method :shards_for_hostname, list(struct(ShardInfo)), field(:hostname, string, 1)
       thrift_method :get_busy_shards, list(struct(ShardInfo))
+      thrift_method :list_hostnames, list(string)
 
       thrift_method :rebuild_schema, void
     end
+
+    class JobManager < GizzmoService
+      thrift_method :retry_errors, void
+      thrift_method :stop_writes, void
+      thrift_method :resume_writes, void
+      thrift_method :retry_errors_for, void, field(:priority, i32, 1)
+      thrift_method :stop_writes_for, void, field(:priority, i32, 1)
+      thrift_method :resume_writes_for, void, field(:priority, i32, 1)
+      thrift_method :is_writing, bool, field(:priority, i32, 1)
+      thrift_method :inject_job, void, field(:priority, i32, 1), field(:job, string, 2)
+    end
   end
-end
+end

data/lib/gizzmo.rb

@@ -6,7 +6,14 @@ require "ostruct"
 require "gizzard"
 require "yaml"
 
+DOC_STRINGS = {
+  "create" => "Create shard(s) of a given Java/Scala class.  If you don't know the list of available classes, you can just try a bogus class, and the exception will include a list of valid classes.",
+  "wrap" => "Wrapping creates a new (virtual, e.g. blocking, replicating, etc.) shard, and relinks SHARD_ID_TO_WRAP's parent links to run through the new shard.",
+  "inject" => "Inject jobs (as literal json) into the server. Jobs can be linefeed-terminated from stdin, or passed as arguments. Priority is server-defined, but typically lower numbers (like 1) are lower priority."
+}
+
 ORIGINAL_ARGV = ARGV.dup
+zero = File.basename($0)
 
 # Container for parsed options
 global_options     = OpenStruct.new
@@ -28,10 +35,35 @@ rescue => e
   abort "Unknown error loading ~/.gizzmorc: #{e.message}"
 end
 
+def split(string)
+  return [] unless string
+  a = []
+  tokens = string.split(/\s+/)
+  a << tokens.shift
+  tokens.each do |token|
+    s = a.last
+    if s.length + token.length + 1 < 80
+      s << " #{token}"
+    else
+      a << token
+    end
+  end
+  a
+end
+
+def separators(opts, string)
+  opts.separator("")
+  split(string).each do |substr|
+    opts.separator(substr)
+  end
+  opts.separator("")
+end
+
 subcommands = {
   'create' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} create [options] HOST TABLE_PREFIX CLASS_NAME"
-
+    opts.banner = "Usage: #{zero} create [options] CLASS_NAME SHARD_ID [MORE SHARD_IDS...]"
+    separators(opts, DOC_STRINGS["create"])
+    
     opts.on("-s", "--source-type=TYPE") do |s|
       subcommand_options.source_type = s
     end
@@ -41,19 +73,32 @@ subcommands = {
     end
   end,
   'wrap' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} wrap CLASS_NAME SHARD_ID_TO_WRAP [MORE SHARD_IDS...]"
+    opts.banner = "Usage: #{zero} wrap CLASS_NAME SHARD_ID_TO_WRAP [MORE SHARD_IDS...]"
+    separators(opts, DOC_STRINGS["wrap"])
   end,
   'subtree' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} subtree SHARD_ID"
+    opts.banner = "Usage: #{zero} subtree SHARD_ID"
+    separators(opts, DOC_STRINGS["subtree"])
+  end,
+  'hosts' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} hosts"
+    separators(opts, DOC_STRINGS["hosts"])
+  end,
+  'deleteforwarding' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} deleteforwarding TABLE_ID BASE_ID SHARD_ID"
+    separators(opts, DOC_STRINGS["deleteforwarding"])
   end,
   'delete' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} delete SHARD_ID_TO_DELETE [MORE SHARD_IDS]"
+    opts.banner = "Usage: #{zero} delete SHARD_ID_TO_DELETE [MORE SHARD_IDS]"
+    separators(opts, DOC_STRINGS["delete"])
   end,
   'addforwarding' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} addforwarding TABLE_ID BASE_ID SHARD_ID"
+    opts.banner = "Usage: #{zero} addforwarding TABLE_ID BASE_ID SHARD_ID"
+    separators(opts, DOC_STRINGS["addforwarding"])
   end,
   'forwardings' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} show [options]"
+    opts.banner = "Usage: #{zero} show [options]"
+    separators(opts, DOC_STRINGS["forwardings"])
 
     opts.on("-t", "--tables=IDS", "Show only the specified table ids (comma separated)") do |table_ids|
       subcommand_options.table_ids ||= []
@@ -61,10 +106,12 @@ subcommands = {
     end
   end,
   'unwrap' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} unwrap SHARD_ID_TO_REMOVE [MORE SHARD_IDS]"
+    opts.banner = "Usage: #{zero} unwrap SHARD_ID_TO_REMOVE [MORE SHARD_IDS]"
+    separators(opts, DOC_STRINGS["unwrap"])
   end,
   'find' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} find [options]"
+    opts.banner = "Usage: #{zero} find [options]"
+    separators(opts, DOC_STRINGS["find"])
 
     opts.on("-t", "--type=TYPE", "Return only shards of the specified TYPE") do |shard_type|
       subcommand_options.shard_type = shard_type
@@ -75,37 +122,82 @@ subcommands = {
     end
   end,
   'links' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} links SHARD_ID [MORE SHARD_IDS...]"
+    opts.banner = "Usage: #{zero} links SHARD_ID [MORE SHARD_IDS...]"
+    separators(opts, DOC_STRINGS["links"])
   end,
   'info' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} info SHARD_ID [MORE SHARD_IDS...]"
+    opts.banner = "Usage: #{zero} info SHARD_ID [MORE SHARD_IDS...]"
+    separators(opts, DOC_STRINGS["info"])
   end,
   'reload' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} reload"
+    opts.banner = "Usage: #{zero} reload"
+    separators(opts, DOC_STRINGS["reload"])
   end,
   'addlink' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} link PARENT_SHARD_ID CHILD_SHARD_ID WEIGHT"
+    opts.banner = "Usage: #{zero} link PARENT_SHARD_ID CHILD_SHARD_ID WEIGHT"
+    separators(opts, DOC_STRINGS["addlink"])
   end,
   'unlink' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} unlink PARENT_SHARD_ID CHILD_SHARD_ID"
+    opts.banner = "Usage: #{zero} unlink PARENT_SHARD_ID CHILD_SHARD_ID"
+    separators(opts, DOC_STRINGS["unlink"])
   end,
   'lookup' => OptionParser.new do |opts|
-    opts.banner = "Usage: #{$0} lookup TABLE_ID SOURCE_ID"
+    opts.banner = "Usage: #{zero} lookup TABLE_ID SOURCE_ID"
+    separators(opts, DOC_STRINGS["lookup"])
+  end,
+  'copy' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} copy SOURCE_SHARD_ID DESTINATION_SHARD_ID"
+    separators(opts, DOC_STRINGS["copy"])
+  end,
+  'busy' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} busy"
+    separators(opts, DOC_STRINGS["busy"])
+  end,
+  'setup-migrate' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} setup-migrate SOURCE_SHARD_ID DESTINATION_SHARD_ID"
+    separators(opts, DOC_STRINGS["setup-migrate"])
+  end,
+  'finish-migrate' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} finish-migrate SOURCE_SHARD_ID DESTINATION_SHARD_ID"
+    separators(opts, DOC_STRINGS["finish-migrate"])
+  end,
+  'inject' => OptionParser.new do |opts|
+    opts.banner = "Usage: #{zero} inject PRIORITY JOBS..."
+    separators(opts, DOC_STRINGS["inject"])
   end
 }
 
 global = OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} [global-options] SUBCOMMAND [subcommand-options]"
+  opts.banner = "Usage: #{zero} [global-options] SUBCOMMAND [subcommand-options]"
+  opts.separator ""
+  opts.separator "Gizzmo is a tool for manipulating the forwardings and replication structure of"
+  opts.separator "Gizzard-based datastores.  It can also perform bulk job operations."
+  opts.separator ""
+  opts.separator "You can type `#{zero} help SUBCOMMAND` for help on a specific subcommand. It's"
+  opts.separator "also useful to remember that global options come *before* the subcommand, while"
+  opts.separator "subcommand options come *after* the subcommand."
+  opts.separator ""
+  opts.separator "You may find it useful to create a ~/.gizzmorc file, which is simply YAML"
+  opts.separator "key/value pairs corresponding to options you want by default. A common .gizzmorc"
+  opts.separator "simply contain:"
+  opts.separator ""
+  opts.separator "    host: localhost"
+  opts.separator "    port: 7917"
   opts.separator ""
   opts.separator "Subcommands:"
   subcommands.keys.compact.sort.each do |sc|
-    opts.separator "  #{sc}"
+    base = "  #{sc}"
+    if doc = DOC_STRINGS[sc]
+      base += " " * (20 - base.length)
+      base += " -- "
+      base += doc[0..(76 - base.length)]
+      base += "..."
+    end
+    opts.separator base
   end
   opts.separator ""
-  opts.separator "You can type `#{$0} help SUBCOMMAND` for help on a specific subcommand."
   opts.separator ""
   opts.separator "Global options:"
-
   opts.on("-H", "--host=HOSTNAME", "HOSTNAME of remote thrift service") do |host|
     global_options.host = host
   end
@@ -139,7 +231,7 @@ global = OptionParser.new do |opts|
   opts.on("-f", "--force", "Don't display confirmation dialogs") do |force|
     global_options.force = force
   end
-  
+
   opts.on_tail("-v", "--version", "Show version") do
     puts GIZZMO_VERSION
     exit
@@ -182,14 +274,13 @@ unless subcommands.include?(subcommand_name)
 end
 
 log = global_options.log || "./gizzmo.log"
-service = Gizzard::Thrift::ShardManager.new(global_options.host, global_options.port, log, global_options.dry)
 
 while !$stdin.tty? && line = STDIN.gets
   argv << line.strip
 end
 
 begin
-  Gizzard::Command.run(subcommand_name, service, global_options, argv, subcommand_options)
+  Gizzard::Command.run(subcommand_name, global_options, argv, subcommand_options, log)
 rescue HelpNeededError => e
   if e.class.name != e.message
     STDERR.puts("=" * 80)
@@ -198,7 +289,7 @@ rescue HelpNeededError => e
   end
   STDERR.puts subcommands[subcommand_name]
   exit 1
-rescue ThriftClient::Simple::ThriftException, Gizzard::Thrift::ShardException => e
+rescue ThriftClient::Simple::ThriftException, Gizzard::Thrift::ShardException, Errno::ECONNREFUSED => e
   STDERR.puts e.message
   exit 1
 rescue Errno::EPIPE

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 5
-  version: 0.3.5
+  - 4
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Kyle Maxwell
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -07:00
+date: 2010-07-29 00:00:00 -07:00
 default_executable: gizzmo
 dependencies: []