garru-ruby_scribe_client 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,3 +1,4 @@
+v0.0.6 fb303: added host option.  moved client to module namespace 
 v0.0.5 wrote fb303 client for scribe mgmt
 v0.0.4 removing flush because framed transport doesn't need it
 v0.0.3 flush instead of open/close each time

data/Manifest

@@ -1,6 +1,7 @@
 CHANGELOG
 etc/scribe_cat.rb
-etc/scribe_munin_plugin.rb
+etc/scribe_munin.rb
+etc/scribe_net
 etc/test.rb
 lib/ruby_scribe_client/FacebookService.rb
 lib/ruby_scribe_client/fb303_client.rb
@@ -14,7 +15,6 @@ LICENSE
 Manifest
 Rakefile
 README
-ruby_scribe_client.gemspec
 vendor/thrift/client.rb
 vendor/thrift/deprecation.rb
 vendor/thrift/exceptions.rb

data/etc/{scribe_munin_plugin.rb → scribe_munin.rb}

@@ -10,7 +10,7 @@ class ScribeStats
   CATEGORY = 'scribe'
 
   def initialize(host, port)
-    @scribe = FB303.new("#{host}:#{port}")
+    @scribe = FB303.new(host, port)
     @category = 'scribe'
   end
 
@@ -74,7 +74,7 @@ else
   $stderr.puts "can't find chart name"
 end
 
-starling = StarlingStats.new(HOST, PORT)
+starling = ScribeStats.new(HOST, PORT)
 
 command = "#{chart_name}_munin"
 

data/etc/scribe_net

@@ -0,0 +1 @@
+scribe_munin.rb

data/lib/ruby_scribe_client/fb303_client.rb

@@ -1,68 +1,72 @@
-class FB303
-  attr_accessor :client
+require File.join([File.dirname(__FILE__), '..', '..', 'vendor','thrift'])
+require File.join([File.dirname(__FILE__) ,'FacebookService'])
+require File.join([File.dirname(__FILE__), 'scribe_types'])
+module FB303
+  class Client
+    attr_accessor :client
   
-  COMMAND_MAP = { :reload => 'reinitialize',
-    :stop => 'shutdown',
-    :version => 'getVersion',
-    :name => 'getName',
-    :alive => 'aliveSince'
-  }
+    COMMAND_MAP = { :reload => 'reinitialize',
+      :stop => 'shutdown',
+      :version => 'getVersion',
+      :name => 'getName',
+      :alive => 'aliveSince'
+    }
    
-  STATUS = {
-     Fb_status::DEAD => "DEAD",
-     Fb_status::STARTING => "STARTING",
-     Fb_status::ALIVE => "ALIVE",
-     Fb_status::STOPPING => "STOPPING",
-     Fb_status::STOPPED => "STOPPED",
-     Fb_status::WARNING => "WARNING"
-  }
+    STATUS = {
+       Fb_status::DEAD => "DEAD",
+       Fb_status::STARTING => "STARTING",
+       Fb_status::ALIVE => "ALIVE",
+       Fb_status::STOPPING => "STOPPING",
+       Fb_status::STOPPED => "STOPPED",
+       Fb_status::WARNING => "WARNING"
+    }
   
-  def initialize(port)
-    @transport = Thrift::FramedTransport.new(Thrift::Socket.new('metrics.seriousops.com', port))
-    @protocol = Thrift::BinaryProtocol.new(@transport, false, false)
-    @client = FacebookService::Client.new(@protocol)
-  end
+    def initialize(host, port)
+      @transport = Thrift::FramedTransport.new(Thrift::Socket.new(host, port))
+      @protocol = Thrift::BinaryProtocol.new(@transport, false, false)
+      @client = FacebookService::Client.new(@protocol)
+    end
 
-  def method_missing(method)
-    if COMMAND_MAP.has_key?(method)
-      if [:version, :alive, :name].include?(method)
-        result = self.send(COMMAND_MAP[method])
-        puts result
-      elsif [:stop, :reload].include?(method)
-        result = self.send(COMMAND_MAP[method])
-            puts result
+    def method_missing(method)
+      if COMMAND_MAP.has_key?(method)
+        if [:version, :alive, :name].include?(method)
+          result = self.send(COMMAND_MAP[method])
+          puts result
+        elsif [:stop, :reload].include?(method)
+          result = self.send(COMMAND_MAP[method])
+              puts result
+        end
+      elsif @client.respond_to?(method)
+        @transport.open
+        return @client.send(method)
+        @transport.close
+      else
+        raise NoMethodError.new;
       end
-    elsif @client.respond_to?(method)
-      @transport.open
-      return @client.send(method)
-      @transport.close
-    else
-      require 'ruby-debug'; debugger
-      raise NoMethodError.new;
     end
-  end
   
-  def status
-    status = self.getStatus
-    status_details = self.getStatusDetails || ""
-    msg = fb_status_string(status)
-    msg += " - %s" % status_details if status_details.size > 0
-    puts msg
-    return (status == Fb_status::ALIVE) ? 2 : 3    
-  end
+    def status
+      status = self.getStatus
+      status_details = self.getStatusDetails || ""
+      msg = fb_status_string(status)
+      msg += " - %s" % status_details if status_details.size > 0
+      puts msg
+      return (status == Fb_status::ALIVE) ? 2 : 3    
+    end
   
-  def counters
-    # require 'ruby-debug'; debugger
-    self.getCounters.each_pair do |key, value|
-      puts "%s: %d" % [key, value]
+    def counters
+      # require 'ruby-debug'; debugger
+      self.getCounters.each_pair do |key, value|
+        puts "%s: %d" % [key, value]
+      end
     end
-  end
   
-  def get_counters
-    self.getCounters
-  end
+    def get_counters
+      self.getCounters
+    end
   
-  def fb_status_string(status_code)
-    STATUS[status_code]
+    def fb_status_string(status_code)
+      STATUS[status_code]
+    end
   end
 end

data/lib/ruby_scribe_client/scribe.rb

@@ -7,7 +7,8 @@
 require File.join([File.dirname(__FILE__), '..', '..', 'vendor','thrift'])
 require File.join([File.dirname(__FILE__) ,'FacebookService'])
 require File.join([File.dirname(__FILE__), 'scribe_types'])
-require File.join([File.dirname(__FILE__), 'fb303_client'])
+require File.join([File.dirname(__FILE__), 'ruby_scribe_client', 'fb303_client'])
+
 module Scribe
   class Client < FacebookService::Client 
     include ::Thrift::Client

data/ruby_scribe_client.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby_scribe_client}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gary Tsang"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Ruby Scribe Client. Package and Wrapper for generated ruby interfaces}
   s.email = %q{}
   s.extra_rdoc_files = ["CHANGELOG", "lib/ruby_scribe_client/FacebookService.rb", "lib/ruby_scribe_client/fb303_client.rb", "lib/ruby_scribe_client/fb303_types.rb", "lib/ruby_scribe_client/reflection_limited_types.rb", "lib/ruby_scribe_client/scribe.rb", "lib/ruby_scribe_client/scribe_mgmt.rb", "lib/ruby_scribe_client/scribe_types.rb", "lib/ruby_scribe_client.rb", "LICENSE", "README"]
-  s.files = ["CHANGELOG", "etc/scribe_cat.rb", "etc/scribe_munin_plugin.rb", "etc/test.rb", "lib/ruby_scribe_client/FacebookService.rb", "lib/ruby_scribe_client/fb303_client.rb", "lib/ruby_scribe_client/fb303_types.rb", "lib/ruby_scribe_client/reflection_limited_types.rb", "lib/ruby_scribe_client/scribe.rb", "lib/ruby_scribe_client/scribe_mgmt.rb", "lib/ruby_scribe_client/scribe_types.rb", "lib/ruby_scribe_client.rb", "LICENSE", "Manifest", "Rakefile", "README", "ruby_scribe_client.gemspec", "vendor/thrift/client.rb", "vendor/thrift/deprecation.rb", "vendor/thrift/exceptions.rb", "vendor/thrift/processor.rb", "vendor/thrift/protocol/binaryprotocol.rb", "vendor/thrift/protocol/binaryprotocolaccelerated.rb", "vendor/thrift/protocol/tbinaryprotocol.rb", "vendor/thrift/protocol/tprotocol.rb", "vendor/thrift/protocol.rb", "vendor/thrift/serializer.rb", "vendor/thrift/server/httpserver.rb", "vendor/thrift/server/nonblockingserver.rb", "vendor/thrift/server/thttpserver.rb", "vendor/thrift/server/tserver.rb", "vendor/thrift/server.rb", "vendor/thrift/struct.rb", "vendor/thrift/thrift.rb", "vendor/thrift/transport/httpclient.rb", "vendor/thrift/transport/socket.rb", "vendor/thrift/transport/thttpclient.rb", "vendor/thrift/transport/tsocket.rb", "vendor/thrift/transport/ttransport.rb", "vendor/thrift/transport/unixsocket.rb", "vendor/thrift/transport.rb", "vendor/thrift/types.rb", "vendor/thrift.rb"]
+  s.files = ["CHANGELOG", "etc/scribe_cat.rb", "etc/scribe_munin.rb", "etc/scribe_net", "etc/test.rb", "lib/ruby_scribe_client/FacebookService.rb", "lib/ruby_scribe_client/fb303_client.rb", "lib/ruby_scribe_client/fb303_types.rb", "lib/ruby_scribe_client/reflection_limited_types.rb", "lib/ruby_scribe_client/scribe.rb", "lib/ruby_scribe_client/scribe_mgmt.rb", "lib/ruby_scribe_client/scribe_types.rb", "lib/ruby_scribe_client.rb", "LICENSE", "Manifest", "Rakefile", "README", "vendor/thrift/client.rb", "vendor/thrift/deprecation.rb", "vendor/thrift/exceptions.rb", "vendor/thrift/processor.rb", "vendor/thrift/protocol/binaryprotocol.rb", "vendor/thrift/protocol/binaryprotocolaccelerated.rb", "vendor/thrift/protocol/tbinaryprotocol.rb", "vendor/thrift/protocol/tprotocol.rb", "vendor/thrift/protocol.rb", "vendor/thrift/serializer.rb", "vendor/thrift/server/httpserver.rb", "vendor/thrift/server/nonblockingserver.rb", "vendor/thrift/server/thttpserver.rb", "vendor/thrift/server/tserver.rb", "vendor/thrift/server.rb", "vendor/thrift/struct.rb", "vendor/thrift/thrift.rb", "vendor/thrift/transport/httpclient.rb", "vendor/thrift/transport/socket.rb", "vendor/thrift/transport/thttpclient.rb", "vendor/thrift/transport/tsocket.rb", "vendor/thrift/transport/ttransport.rb", "vendor/thrift/transport/unixsocket.rb", "vendor/thrift/transport.rb", "vendor/thrift/types.rb", "vendor/thrift.rb", "ruby_scribe_client.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/garru/ruby_scribe_client}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Ruby_scribe_client", "--main", "README"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: garru-ruby_scribe_client
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Gary Tsang
@@ -34,7 +34,8 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - etc/scribe_cat.rb
-- etc/scribe_munin_plugin.rb
+- etc/scribe_munin.rb
+- etc/scribe_net
 - etc/test.rb
 - lib/ruby_scribe_client/FacebookService.rb
 - lib/ruby_scribe_client/fb303_client.rb
@@ -48,7 +49,6 @@ files:
 - Manifest
 - Rakefile
 - README
-- ruby_scribe_client.gemspec
 - vendor/thrift/client.rb
 - vendor/thrift/deprecation.rb
 - vendor/thrift/exceptions.rb
@@ -75,6 +75,7 @@ files:
 - vendor/thrift/transport.rb
 - vendor/thrift/types.rb
 - vendor/thrift.rb
+- ruby_scribe_client.gemspec
 has_rdoc: true
 homepage: http://github.com/garru/ruby_scribe_client
 post_install_message: