protobuf 2.7.2 → 2.7.3

data/README.md

@@ -92,11 +92,11 @@ end
 ```
 
 ___Note:__ The generator will pre-define all the classes empty and then
-re-open to apply the defined fields. This is an optomization to prevent
+re-open to apply the defined fields. This is an optimization to prevent
 recursive field errors._
 
-The generated class is now just a plain old ruby object and you
-can use it however you wish.
+The generated class is now just a plain old ruby object.
+You can use it however you wish.
 
 ```ruby
 require 'lib/foo/user.pb'
@@ -340,7 +340,7 @@ that the phone company disconnected their house. Sad and pathetic.
 So hook up the phone lines!
 
 ```
-$ rpc_server -o myserver.com -p 9939 -l ./log/protobuf.log ./config/environment.rb
+$ rpc_server -o myserver.com -p 9399 -l ./log/protobuf.log ./config/environment.rb
 ```
 
 The previous call will start a Socket server running on the given
@@ -364,7 +364,7 @@ result in shutting the server down gracefully.
 
 ```
 $ ps aux | grep rpc_server
-1234 ... rpc_server myservice.com:9939
+1234 ... rpc_server myservice.com:9399
 
 $ kill -QUIT 1234
 rpc_server shutdown

data/lib/protobuf/cli.rb

@@ -32,6 +32,8 @@ module Protobuf
     option :debug,                      :type => :boolean, :default => false, :aliases => %w(-d), :desc => 'Debug Mode. Override log level to DEBUG.'
     option :gc_pause_request,           :type => :boolean, :default => false, :desc => 'Enable/Disable GC pause during request.'
     option :print_deprecation_warnings, :type => :boolean, :default => nil, :desc => 'Cause use of deprecated fields to be printed or ignored.'
+    option :workers_only,               :type => :boolean, :default => false, :desc => "Starts process with only workers (no broker/frontend is started) only relevant for Zmq Server"
+    option :worker_port,                :type => :numeric, :default => nil, :desc => "Port for 'backend' where workers connect (defaults to port + 1)"
 
     def start(app_file)
       debug_say 'Configuring the rpc_server process'
@@ -47,7 +49,6 @@ module Protobuf
       run_if_no_abort { require_application!(app_file) }
       run_if_no_abort { configure_process_name(app_file) }
       run_if_no_abort { start_server! }
-
     rescue => e
       say_and_exit!('ERROR: RPC Server failed to start.', e)
     end
@@ -170,11 +171,15 @@ module Protobuf
       end
 
       def runner_options
-        { :host => options.host,
+        { 
+          :host => options.host,
           :port => options.port,
           :backlog => options.backlog,
           :threshold => options.threshold,
-          :threads => options.threads }
+          :threads => options.threads,
+          :worker_port => options.worker_port || (options.port + 1),
+          :workers_only => !!ENV['PB_WORKERS_ONLY'] || options.workers_only
+        }
       end
 
       def say_and_exit!(message, exception = nil)
@@ -209,9 +214,13 @@ module Protobuf
 
       # Start the runner and log the relevant options.
       def start_server!
+        @runner.register_signals
+
         debug_say 'Invoking server start'
         @runner.run(runner_options) do
-          Protobuf::Logger.info { "pid #{::Process.pid} -- #{@mode} RPC Server listening at #{options.host}:#{options.port}" }
+          ::Protobuf::Logger.info { 
+            "pid #{::Process.pid} -- #{@mode} RPC Server listening at #{options.host}:#{options.port}"
+          }
         end
       end
 

data/lib/protobuf/rpc/servers/evented_runner.rb

@@ -2,8 +2,8 @@ module Protobuf
   module Rpc
     class EventedRunner
 
-      def self.stop
-        ::EventMachine.stop_event_loop if ::EventMachine.reactor_running?
+      def self.register_signals
+        # Noop
       end
 
       def self.run(options)
@@ -16,6 +16,11 @@ module Protobuf
 				yield if block_given?
         ::EM.reactor_running? ? ::EM.reactor_thread.join : ::EM.run
       end
+
+      def self.stop
+        ::EventMachine.stop_event_loop if ::EventMachine.reactor_running?
+      end
+
     end
   end
 end

data/lib/protobuf/rpc/servers/socket_runner.rb

@@ -2,8 +2,8 @@ module Protobuf
   module Rpc
     class SocketRunner
 
-      def self.stop
-        ::Protobuf::Rpc::Socket::Server.stop
+      def self.register_signals
+        # noop
       end
 
       def self.run(server)
@@ -22,6 +22,10 @@ module Protobuf
         ::Protobuf::Rpc::Socket::Server.run(server_config)
       end
 
+      def self.stop
+        ::Protobuf::Rpc::Socket::Server.stop
+      end
+
     end
   end
 end

data/lib/protobuf/rpc/servers/zmq/broker.rb

@@ -85,9 +85,8 @@ module Protobuf
           end
 
           def setup_backend(options = {})
-            dealer_options = options.merge(:port => options[:port] + 1)
-            host = dealer_options[:host]
-            port = dealer_options[:port]
+            host = options[:host]
+            port = options[:worker_port]
 
             zmq_backend = context.socket(::ZMQ::ROUTER)
             zmq_error_check(zmq_backend.bind(bind_address(host, port)))

data/lib/protobuf/rpc/servers/zmq/server.rb

@@ -12,11 +12,14 @@ module Protobuf
         # Class Methods
         #
         def self.run(options = {})
-          log_debug { sign_message("initializing broker") }
-          @broker = ::Protobuf::Rpc::Zmq::Broker.new(options)
-          local_worker_threads = options[:threads]
+          @options = options
+
+          unless options[:workers_only]
+            log_debug { sign_message("initializing broker") }
+            @broker = ::Protobuf::Rpc::Zmq::Broker.new(options)
+          end
 
-          @worker_options = options.merge(:port => options[:port] + 1)
+          local_worker_threads = options[:threads]
           log_debug { sign_message("starting server workers") }
 
           local_worker_threads.times do
@@ -26,7 +29,12 @@ module Protobuf
           @running = true
           log_debug { sign_message("server started") }
           while self.running? do
-            @broker.poll
+            if options[:workers_only]
+              sleep 5
+              Thread.pass
+            else
+              @broker.poll
+            end
           end
         ensure
           @broker.teardown if @broker
@@ -37,11 +45,11 @@ module Protobuf
         end
 
         def self.start_worker
-          @threads << Thread.new(@worker_options) { |worker_options|
+          @threads << Thread.new(@options) { |options|
             begin
-              ::Protobuf::Rpc::Zmq::Worker.new(worker_options).run
+              ::Protobuf::Rpc::Zmq::Worker.new(options).run
             rescue => e
-              message =  "Worker Failed, spawning new worker: #{e.inspect}\n #{e.backtrace.join("\n")}"
+              message =  "Worker Failed, spawning new worker: #{e.inspect}\n #{e.backtrace.join($/)}"
               $stderr.puts message
               log_error { message }
 
@@ -58,6 +66,10 @@ module Protobuf
           end
         end
 
+        def self.threads
+          @threads
+        end
+
         @threads ||= []
       end
     end

data/lib/protobuf/rpc/servers/zmq/worker.rb

@@ -13,7 +13,7 @@ module Protobuf
         #
         def initialize(options = {})
           host = options[:host]
-          port = options[:port]
+          port = options[:worker_port]
 
           @zmq_context = ::ZMQ::Context.new
           @socket = @zmq_context.socket(::ZMQ::REQ)

data/lib/protobuf/rpc/servers/zmq_runner.rb

@@ -1,9 +1,14 @@
 module Protobuf
   module Rpc
     class ZmqRunner
+      include ::Protobuf::Logger::LogMethods
 
-      def self.stop
-        Protobuf::Rpc::Zmq::Server.stop
+      def self.register_signals
+        trap(:TTIN) do 
+          log_info { "TTIN received: Starting new worker" }
+          ::Protobuf::Rpc::Zmq::Server.start_worker
+          log_info { "Worker count : #{::Protobuf::Rpc::Zmq::Server.threads.size}" }
+        end
       end
 
       def self.run(server)
@@ -17,9 +22,14 @@ module Protobuf
                         end
 
 				yield if block_given?
-        Protobuf::Rpc::Zmq::Server.run(server_config)
+
+        ::Protobuf::Rpc::Zmq::Server.run(server_config)
       end
-    end
 
+      def self.stop
+        ::Protobuf::Rpc::Zmq::Server.stop
+      end
+
+    end
   end
 end

data/lib/protobuf/version.rb

@@ -1,4 +1,4 @@
 module Protobuf
-  VERSION = '2.7.2'
+  VERSION = '2.7.3'
   PROTOC_VERSION = '2.4.1'
 end

data/spec/functional/zmq_server_spec.rb

@@ -5,7 +5,13 @@ describe 'Functional ZMQ Client' do
   before(:all) do
     load "protobuf/zmq.rb"
     Thread.abort_on_exception = true
-    server = OpenStruct.new(:host => "127.0.0.1", :port => 9399, :backlog => 100, :threshold => 100, :threads => 5)
+    server = OpenStruct.new(:host => "127.0.0.1", 
+                            :port => 9399, 
+                            :worker_port => 9400, 
+                            :backlog => 100, 
+                            :threshold => 100, 
+                            :threads => 5)
+
     @server_thread = Thread.new(server) { |s| Protobuf::Rpc::ZmqRunner.run(s) }
     Thread.pass until Protobuf::Rpc::Zmq::Server.running?
   end

data/spec/lib/protobuf/cli_spec.rb

@@ -215,6 +215,52 @@ describe ::Protobuf::CLI do
           ::Protobuf.connector_type.should == :evented
         end
       end
+      
+      context 'zmq workers only' do
+        let(:test_args) { [ '--workers_only', '--zmq' ] }
+        let(:runner) { ::Protobuf::Rpc::ZmqRunner }
+
+        before do
+          ::Protobuf::Rpc::SocketRunner.should_not_receive(:run)
+          ::Protobuf::Rpc::EventedRunner.should_not_receive(:run)
+        end
+
+        it 'is activated by the --workers_only switch' do
+          runner.should_receive(:run) do |options|
+            options[:workers_only].should be_true
+          end
+
+          described_class.start(args)
+        end
+
+        it 'is activated by PB_WORKERS_ONLY=1 ENV variable' do 
+          ENV['PB_WORKERS_ONLY'] = "1"
+          runner.should_receive(:run) do |options|
+            options[:workers_only].should be_true
+          end
+
+          described_class.start(args)
+          ENV.delete('PB_WORKERS_ONLY')
+        end
+      end
+
+      context 'zmq worker port' do
+        let(:test_args) { [ '--worker_port=1234', '--zmq' ] }
+        let(:runner) { ::Protobuf::Rpc::ZmqRunner }
+
+        before do
+          ::Protobuf::Rpc::SocketRunner.should_not_receive(:run)
+          ::Protobuf::Rpc::EventedRunner.should_not_receive(:run)
+        end
+
+        it 'is activated by the --worker_port switch' do
+          runner.should_receive(:run) do |options|
+            options[:worker_port].should eq(1234)
+          end
+
+          described_class.start(args)
+        end
+      end
 
       context 'zmq' do
         let(:test_args) { [ '--zmq' ] }

data/spec/lib/protobuf/rpc/servers/zmq/broker_spec.rb

@@ -10,7 +10,7 @@ describe ::Protobuf::Rpc::Zmq::Broker do
   end
 
   subject do
-    described_class.new({ :host => '127.0.0.1', :port => 9399 })
+    described_class.new({ :host => '127.0.0.1', :port => 9399, :worker_port => 9400 })
   end
 
   it 'sets up a context' do

data/spec/support/server.rb

@@ -41,6 +41,7 @@ class StubServer
     @running = true
     @options = OpenStruct.new({ :host => "127.0.0.1",
                                 :port => 9399,
+                                :worker_port => 9400,
                                 :delay => 0,
                                 :server => Protobuf::Rpc::Evented::Server }.merge(options))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protobuf
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000Z
+date: 2013-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152135800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152135800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2152134500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152134500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152133000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152133000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2152131280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152131280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152129060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152129060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi-rzmq
-  requirement: &2152127300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152127300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2152112220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152112220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &2152110260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152110260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152107060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152107060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2152104820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152104820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152102000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152102000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2152100180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +198,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152100180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2152097180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,7 +214,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152097180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for
   Ruby.
 email:
@@ -434,7 +499,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1287812807284691989
+      hash: 507016021282761901
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -443,93 +508,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1287812807284691989
+      hash: 507016021282761901
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for Ruby.
-test_files:
-- spec/benchmark/tasks.rb
-- spec/functional/embedded_service_spec.rb
-- spec/functional/evented_server_spec.rb
-- spec/functional/socket_server_spec.rb
-- spec/functional/zmq_server_spec.rb
-- spec/lib/protobuf/cli_spec.rb
-- spec/lib/protobuf/enum_spec.rb
-- spec/lib/protobuf/enum_value_spec.rb
-- spec/lib/protobuf/field/int32_field_spec.rb
-- spec/lib/protobuf/logger_spec.rb
-- spec/lib/protobuf/message_spec.rb
-- spec/lib/protobuf/rpc/client_spec.rb
-- spec/lib/protobuf/rpc/connector_spec.rb
-- spec/lib/protobuf/rpc/connectors/base_spec.rb
-- spec/lib/protobuf/rpc/connectors/common_spec.rb
-- spec/lib/protobuf/rpc/connectors/socket_spec.rb
-- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
-- spec/lib/protobuf/rpc/servers/evented_server_spec.rb
-- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/broker_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
-- spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
-- spec/lib/protobuf/rpc/service_dispatcher_spec.rb
-- spec/lib/protobuf/rpc/service_filters_spec.rb
-- spec/lib/protobuf/rpc/service_spec.rb
-- spec/lib/protobuf_spec.rb
-- spec/spec_helper.rb
-- spec/support/all.rb
-- spec/support/packed_field.rb
-- spec/support/server.rb
-- spec/support/test/enum.pb.rb
-- spec/support/test/enum.proto
-- spec/support/test/resource.pb.rb
-- spec/support/test/resource.proto
-- spec/support/test/resource_service.rb
-- spec/support/test_app_file.rb
-- spec/support/tolerance_matcher.rb
-- test/data/data.bin
-- test/data/data_source.py
-- test/data/types.bin
-- test/data/types_source.py
-- test/data/unk.png
-- test/proto/addressbook.pb.rb
-- test/proto/addressbook.proto
-- test/proto/addressbook_base.pb.rb
-- test/proto/addressbook_base.proto
-- test/proto/addressbook_ext.pb.rb
-- test/proto/addressbook_ext.proto
-- test/proto/collision.pb.rb
-- test/proto/collision.proto
-- test/proto/ext_collision.pb.rb
-- test/proto/ext_collision.proto
-- test/proto/ext_range.pb.rb
-- test/proto/ext_range.proto
-- test/proto/float_default.proto
-- test/proto/lowercase.pb.rb
-- test/proto/lowercase.proto
-- test/proto/merge.pb.rb
-- test/proto/merge.proto
-- test/proto/nested.pb.rb
-- test/proto/nested.proto
-- test/proto/optional_field.pb.rb
-- test/proto/optional_field.proto
-- test/proto/packed.pb.rb
-- test/proto/packed.proto
-- test/proto/rpc.proto
-- test/proto/types.pb.rb
-- test/proto/types.proto
-- test/test_addressbook.rb
-- test/test_enum_value.rb
-- test/test_extension.rb
-- test/test_lowercase.rb
-- test/test_message.rb
-- test/test_optional_field.rb
-- test/test_packed_field.rb
-- test/test_parse.rb
-- test/test_repeated_types.rb
-- test/test_serialize.rb
-- test/test_standard_message.rb
-- test/test_types.rb
+test_files: []
 has_rdoc: