From 0b933fc83b8b519c8e587caa6606dd372dda18af Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 12 Dec 2011 07:56:00 +0000 Subject: avoid relying on exceptions for list_keys This will make debug output quieter. --- lib/mogilefs/mogilefs.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/mogilefs/mogilefs.rb b/lib/mogilefs/mogilefs.rb index 1ec357d..819f69a 100644 --- a/lib/mogilefs/mogilefs.rb +++ b/lib/mogilefs/mogilefs.rb @@ -268,12 +268,10 @@ class MogileFS::MogileFS < MogileFS::Client @backend.respond_to?(:_list_keys) and return @backend._list_keys(domain, prefix, after, limit, &block) - begin - res = @backend.list_keys(:domain => domain, :prefix => prefix, - :after => after, :limit => limit) - rescue MogileFS::Backend::NoneMatchError - return - end + res = @backend.list_keys(:domain => domain, :prefix => prefix, + :after => after, :limit => limit, + :ruby_no_raise => true) + MogileFS::Backend::NoneMatchError === res and return keys = (1..res['key_count'].to_i).map { |i| res["key_#{i}"] } if block -- cgit v1.2.3-24-ge0c7