priam 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/priam/command/get.rb

@@ -9,8 +9,6 @@ module Priam::Command
       super_column = params[:super_column]
       name = params[:value_column]
       with_key_flag = params[:with_key_flag]
-      weight_second = params[:weight_second]
-      retry_max_count = params[:retry_max_count]
 
       client = Cassandra.new(keyspace, "#{host}:#{port}")
       
@@ -28,35 +26,21 @@ module Priam::Command
           next
         end
       
-        retry_count = 0
-        begin
-          record = Priam.get_column(client, column_family, super_column, key, params)    
+        record = Priam.get_column(client, column_family, super_column, key, params)    
 
-          if with_key_flag
-            output_stream.print "#{key}\t"
-          end
+        if with_key_flag
+          output_stream.print "#{key}\t"
+        end
 
-          if name then
-            output_stream.puts "#{record[name]}"
-          else
-            output_stream.puts record.to_json
-          end
-          count += 1
-          if count % 10 == 0 then
-            Priam.logger.info " GET [#{key_list.join(',')}]"
-            key_list.clear
-          end
-          retry_count = 0
-        rescue Exception=>e
-          if retry_count < retry_max_count
-            Priam.logger.warn("(EXCEPTION)#{e.message}(#{e.class.name}): #{e.backtrace.map{|s| "  #{s}"}.join("\n")}")
-            Priam.logger.warn("retry(#{retry_count})")
-            retry_count += 1
-            sleep(weight_second)
-            retry
-          else
-            raise e
-          end
+        if name then
+          output_stream.puts "#{record[name]}"
+        else
+          output_stream.puts record.to_json
+        end
+        count += 1
+        if count % 10 == 0 then
+          Priam.logger.info " GET [#{key_list.join(',')}]"
+          key_list.clear
         end
       end
       

data/lib/priam/core/get.rb

@@ -2,7 +2,7 @@ module Priam::Core
   module Get
     def self.get_column(client, column_family, super_column, key, options={})
       raise_exception_flag = options[:raise_exception_flag]
-      retry_max_count = options[:retry_max_count] || 0
+      retry_max_count = options[:retry_max_count] || 5
       weight_second = options[:weight_second] || 1
       
       retry_count = 0
@@ -17,14 +17,13 @@ module Priam::Core
           if raise_exception_flag then
             raise e
           else
-            backtrace = e.backtrace.map{|s| "  #{s}"}.join("\n")
-            Priam.logger.warn(" #{e.message}(#{e.class.name}): #{backtrace}")
+            Priam.logger.warn("(EXCEPTION)#{e.message}(#{e.class.name}): #{e.backtrace.map{|s| "  #{s}"}.join("\n")}")
             return {}
           end
         else
           retry_count += 1
-          Priam.logger.warn(" #{e.message}(#{e.class.name})")
-          Priam.logger.info(" retry(#{retry_count})")
+          Priam.logger.warn("(EXCEPTION)#{e.message}(#{e.class.name}): #{e.backtrace.map{|s| "  #{s}"}.join("\n")}")
+          Priam.logger.warn("retry(#{retry_count})")
           sleep(weight_second) if weight_second
           retry
         end

data/priam.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "priam"
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kenji Hara"]
-  s.date = "2013-03-27"
+  s.date = "2013-03-28"
   s.description = "Command-base client for Cassandra."
   s.email = "haracane@gmail.com"
   s.executables = ["priam"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: priam
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Kenji Hara
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-27 00:00:00 Z
+date: 2013-03-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement