scribe 0.1.2 → 0.2

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.2. Use thrift_client gem.
+
 v0.1.2. Legacy accessors for log levels. Append newlines by default.
 
 v0.1. First release.

data/Manifest

@@ -6,7 +6,6 @@ Rakefile
 conf/scribe.conf
 lib/scribe.rb
 lib/scribe/debug.rb
-lib/scribe/safe_client.rb
 lib/scribe/scribe.rb
 test/scribe_test.rb
 test/test_helper.rb

data/Rakefile

@@ -8,7 +8,7 @@ begin
     p.project = "fauna"
     p.summary = "A Ruby client for the Scribe distributed log server."
     p.rubygems_version = ">= 0.8"
-    p.dependencies = ['thrift', 'rake']
+    p.dependencies = ['thrift_client', 'rake']
     p.ignore_pattern = /^(vendor\/thrift)/
     p.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
     p.url = "http://blog.evanweaver.com/files/doc/fauna/scribe/"
@@ -32,7 +32,7 @@ desc "Restart Scribe"
 task :restart => ["stop", "scribe"] do
 end
 
-# desc "Regenerate thrift bindings for Cassandra" # Dev only
+# desc "Regenerate thrift bindings for Scribe" # Dev only
 task :thrift do
   puts "Generating Thrift bindings"
   # FIXME

data/lib/scribe.rb

@@ -1,6 +1,6 @@
 
 require 'rubygems'
-require 'thrift'
+require 'thrift_client'
 
 HERE = File.expand_path(File.dirname(__FILE__))
 
@@ -14,6 +14,5 @@ ScribeThrift.const_set("LogEntry", LogEntry)
 Object.send(:remove_const, "LogEntry")
 
 $LOAD_PATH << "#{HERE}"
-require 'scribe/safe_client'
 require 'scribe/scribe'
 require 'scribe/debug' if ENV['DEBUG']

data/lib/scribe/scribe.rb

@@ -1,19 +1,13 @@
 
 class Scribe
-  # Created a new client instance. Accepts an optional host, port, default 
-  # category, and flag to control whether newlines are added to each line.
-  def initialize(host = "127.0.0.1", port = 1463, category = "Ruby", add_newlines = true)
-    @host = host
-    @port = port
+  # Created a new client instance. Accepts an optional host and port, default 
+  # category, flag to control whether newlines are added to each line, and
+  # additional settings to be passed to ThriftClient.
+  def initialize(servers = "127.0.0.1:1463", category = "Ruby", add_newlines = true, thrift_client_options = {})
+    @servers = servers
     @category = category
     @add_newlines = add_newlines
-
-    transport = Thrift::FramedTransport.new(Thrift::Socket.new(@host, @port))
-    transport.open
-    
-    @client = ScribeThrift::SafeClient.new(
-      ScribeThrift::Client.new(Thrift::BinaryProtocol.new(transport, false)),
-      transport)
+    @client = ThriftClient.new(ScribeThrift::Client, @servers, thrift_client_options)
   end
 
   # Log a message. Accepts a string and an optional category.

data/scribe.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scribe}
-  s.version = "0.1.2"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2009-10-01}
+  s.date = %q{2009-10-13}
   s.description = %q{A Ruby client for the Scribe distributed log server.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/scribe.rb", "lib/scribe/debug.rb", "lib/scribe/safe_client.rb", "lib/scribe/scribe.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "conf/scribe.conf", "lib/scribe.rb", "lib/scribe/debug.rb", "lib/scribe/safe_client.rb", "lib/scribe/scribe.rb", "test/scribe_test.rb", "test/test_helper.rb", "vendor/gen-rb/facebook_service.rb", "vendor/gen-rb/fb303_constants.rb", "vendor/gen-rb/fb303_types.rb", "vendor/gen-rb/scribe.rb", "vendor/gen-rb/scribe_constants.rb", "vendor/gen-rb/scribe_types.rb", "scribe.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/scribe.rb", "lib/scribe/debug.rb", "lib/scribe/scribe.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "conf/scribe.conf", "lib/scribe.rb", "lib/scribe/debug.rb", "lib/scribe/scribe.rb", "test/scribe_test.rb", "test/test_helper.rb", "vendor/gen-rb/facebook_service.rb", "vendor/gen-rb/fb303_constants.rb", "vendor/gen-rb/fb303_types.rb", "vendor/gen-rb/scribe.rb", "vendor/gen-rb/scribe_constants.rb", "vendor/gen-rb/scribe_types.rb", "scribe.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/scribe/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Scribe", "--main", "README"]
   s.require_paths = ["lib"]
@@ -26,14 +26,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thrift>, [">= 0"])
+      s.add_runtime_dependency(%q<thrift_client>, [">= 0"])
       s.add_runtime_dependency(%q<rake>, [">= 0"])
     else
-      s.add_dependency(%q<thrift>, [">= 0"])
+      s.add_dependency(%q<thrift_client>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
-    s.add_dependency(%q<thrift>, [">= 0"])
+    s.add_dependency(%q<thrift_client>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scribe
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: "0.2"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,11 +30,11 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-10-01 00:00:00 -07:00
+date: 2009-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thrift
+  name: thrift_client
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -65,7 +65,6 @@ extra_rdoc_files:
 - README
 - lib/scribe.rb
 - lib/scribe/debug.rb
-- lib/scribe/safe_client.rb
 - lib/scribe/scribe.rb
 files: 
 - CHANGELOG
@@ -76,7 +75,6 @@ files:
 - conf/scribe.conf
 - lib/scribe.rb
 - lib/scribe/debug.rb
-- lib/scribe/safe_client.rb
 - lib/scribe/scribe.rb
 - test/scribe_test.rb
 - test/test_helper.rb

data/lib/scribe/safe_client.rb

@@ -1,23 +0,0 @@
-
-module ScribeThrift #:nodoc: all
-  class SafeClient  
-    def initialize(client, transport, reset = false)
-      @client = client 
-      @transport = transport
-      @reset = reset
-    end
-    
-    def reset_transport
-      @transport.close rescue nil
-      @transport.open
-    end
-    
-    def method_missing(*args)
-      reset_transport if @reset
-      @client.send(*args)
-    rescue IOError, UnavailableException, Thrift::ProtocolException, Thrift::ApplicationException, Thrift::TransportException
-      reset_transport
-      @client.send(*args)
-    end
-  end
-end