protobuf 2.5.5 → 2.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/protobuf/rpc/servers/zmq/server.rb +19 -3
- data/lib/protobuf/version.rb +1 -1
- metadata +97 -113
|
@@ -16,13 +16,14 @@ module Protobuf
|
|
|
16
16
|
@broker = ::Protobuf::Rpc::Zmq::Broker.new(options)
|
|
17
17
|
local_worker_threads = options[:threads]
|
|
18
18
|
|
|
19
|
-
worker_options = options.merge(:port => options[:port] + 1)
|
|
19
|
+
@worker_options = options.merge(:port => options[:port] + 1)
|
|
20
20
|
log_debug { sign_message("starting server workers") }
|
|
21
|
+
|
|
21
22
|
local_worker_threads.times do
|
|
22
|
-
|
|
23
|
+
self.start_worker
|
|
23
24
|
end
|
|
24
|
-
@running = true
|
|
25
25
|
|
|
26
|
+
@running = true
|
|
26
27
|
log_debug { sign_message("server started") }
|
|
27
28
|
while self.running? do
|
|
28
29
|
@broker.poll
|
|
@@ -35,6 +36,21 @@ module Protobuf
|
|
|
35
36
|
!!@running
|
|
36
37
|
end
|
|
37
38
|
|
|
39
|
+
def self.start_worker(failed_worker = false)
|
|
40
|
+
@threads.select! { |t| t.alive? } if failed_worker
|
|
41
|
+
|
|
42
|
+
@threads << Thread.new(self, @worker_options) { |parent_server, worker_options|
|
|
43
|
+
begin
|
|
44
|
+
::Protobuf::Rpc::Zmq::Worker.new(worker_options).run
|
|
45
|
+
rescue => e
|
|
46
|
+
if parent_server.running?
|
|
47
|
+
log_error { parent_server.sign_message("Restart Worker on Exception: #{e.inspect}\n #{e.backtrace}") }
|
|
48
|
+
parent_server.start_worker(true)
|
|
49
|
+
end
|
|
50
|
+
end
|
|
51
|
+
}
|
|
52
|
+
end
|
|
53
|
+
|
|
38
54
|
def self.stop
|
|
39
55
|
@running = false
|
|
40
56
|
|
data/lib/protobuf/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: protobuf
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.6.0
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -10,11 +10,11 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date:
|
|
13
|
+
date: 2013-01-02 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: activesupport
|
|
17
|
-
requirement:
|
|
17
|
+
requirement: !ruby/object:Gem::Requirement
|
|
18
18
|
none: false
|
|
19
19
|
requirements:
|
|
20
20
|
- - ! '>='
|
|
@@ -22,10 +22,15 @@ dependencies:
|
|
|
22
22
|
version: '0'
|
|
23
23
|
type: :runtime
|
|
24
24
|
prerelease: false
|
|
25
|
-
version_requirements:
|
|
25
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
26
|
+
none: false
|
|
27
|
+
requirements:
|
|
28
|
+
- - ! '>='
|
|
29
|
+
- !ruby/object:Gem::Version
|
|
30
|
+
version: '0'
|
|
26
31
|
- !ruby/object:Gem::Dependency
|
|
27
32
|
name: ffi
|
|
28
|
-
requirement:
|
|
33
|
+
requirement: !ruby/object:Gem::Requirement
|
|
29
34
|
none: false
|
|
30
35
|
requirements:
|
|
31
36
|
- - ! '>='
|
|
@@ -33,10 +38,15 @@ dependencies:
|
|
|
33
38
|
version: '0'
|
|
34
39
|
type: :runtime
|
|
35
40
|
prerelease: false
|
|
36
|
-
version_requirements:
|
|
41
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
42
|
+
none: false
|
|
43
|
+
requirements:
|
|
44
|
+
- - ! '>='
|
|
45
|
+
- !ruby/object:Gem::Version
|
|
46
|
+
version: '0'
|
|
37
47
|
- !ruby/object:Gem::Dependency
|
|
38
48
|
name: multi_json
|
|
39
|
-
requirement:
|
|
49
|
+
requirement: !ruby/object:Gem::Requirement
|
|
40
50
|
none: false
|
|
41
51
|
requirements:
|
|
42
52
|
- - ! '>='
|
|
@@ -44,10 +54,15 @@ dependencies:
|
|
|
44
54
|
version: '0'
|
|
45
55
|
type: :runtime
|
|
46
56
|
prerelease: false
|
|
47
|
-
version_requirements:
|
|
57
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
58
|
+
none: false
|
|
59
|
+
requirements:
|
|
60
|
+
- - ! '>='
|
|
61
|
+
- !ruby/object:Gem::Version
|
|
62
|
+
version: '0'
|
|
48
63
|
- !ruby/object:Gem::Dependency
|
|
49
64
|
name: thor
|
|
50
|
-
requirement:
|
|
65
|
+
requirement: !ruby/object:Gem::Requirement
|
|
51
66
|
none: false
|
|
52
67
|
requirements:
|
|
53
68
|
- - ! '>='
|
|
@@ -55,10 +70,15 @@ dependencies:
|
|
|
55
70
|
version: '0'
|
|
56
71
|
type: :runtime
|
|
57
72
|
prerelease: false
|
|
58
|
-
version_requirements:
|
|
73
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
74
|
+
none: false
|
|
75
|
+
requirements:
|
|
76
|
+
- - ! '>='
|
|
77
|
+
- !ruby/object:Gem::Version
|
|
78
|
+
version: '0'
|
|
59
79
|
- !ruby/object:Gem::Dependency
|
|
60
80
|
name: eventmachine
|
|
61
|
-
requirement:
|
|
81
|
+
requirement: !ruby/object:Gem::Requirement
|
|
62
82
|
none: false
|
|
63
83
|
requirements:
|
|
64
84
|
- - ! '>='
|
|
@@ -66,10 +86,15 @@ dependencies:
|
|
|
66
86
|
version: '0'
|
|
67
87
|
type: :development
|
|
68
88
|
prerelease: false
|
|
69
|
-
version_requirements:
|
|
89
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
90
|
+
none: false
|
|
91
|
+
requirements:
|
|
92
|
+
- - ! '>='
|
|
93
|
+
- !ruby/object:Gem::Version
|
|
94
|
+
version: '0'
|
|
70
95
|
- !ruby/object:Gem::Dependency
|
|
71
96
|
name: ffi-rzmq
|
|
72
|
-
requirement:
|
|
97
|
+
requirement: !ruby/object:Gem::Requirement
|
|
73
98
|
none: false
|
|
74
99
|
requirements:
|
|
75
100
|
- - ! '>='
|
|
@@ -77,10 +102,15 @@ dependencies:
|
|
|
77
102
|
version: '0'
|
|
78
103
|
type: :development
|
|
79
104
|
prerelease: false
|
|
80
|
-
version_requirements:
|
|
105
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
106
|
+
none: false
|
|
107
|
+
requirements:
|
|
108
|
+
- - ! '>='
|
|
109
|
+
- !ruby/object:Gem::Version
|
|
110
|
+
version: '0'
|
|
81
111
|
- !ruby/object:Gem::Dependency
|
|
82
112
|
name: pry
|
|
83
|
-
requirement:
|
|
113
|
+
requirement: !ruby/object:Gem::Requirement
|
|
84
114
|
none: false
|
|
85
115
|
requirements:
|
|
86
116
|
- - ! '>='
|
|
@@ -88,10 +118,15 @@ dependencies:
|
|
|
88
118
|
version: '0'
|
|
89
119
|
type: :development
|
|
90
120
|
prerelease: false
|
|
91
|
-
version_requirements:
|
|
121
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
122
|
+
none: false
|
|
123
|
+
requirements:
|
|
124
|
+
- - ! '>='
|
|
125
|
+
- !ruby/object:Gem::Version
|
|
126
|
+
version: '0'
|
|
92
127
|
- !ruby/object:Gem::Dependency
|
|
93
128
|
name: pry-nav
|
|
94
|
-
requirement:
|
|
129
|
+
requirement: !ruby/object:Gem::Requirement
|
|
95
130
|
none: false
|
|
96
131
|
requirements:
|
|
97
132
|
- - ! '>='
|
|
@@ -99,10 +134,15 @@ dependencies:
|
|
|
99
134
|
version: '0'
|
|
100
135
|
type: :development
|
|
101
136
|
prerelease: false
|
|
102
|
-
version_requirements:
|
|
137
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
138
|
+
none: false
|
|
139
|
+
requirements:
|
|
140
|
+
- - ! '>='
|
|
141
|
+
- !ruby/object:Gem::Version
|
|
142
|
+
version: '0'
|
|
103
143
|
- !ruby/object:Gem::Dependency
|
|
104
144
|
name: rake
|
|
105
|
-
requirement:
|
|
145
|
+
requirement: !ruby/object:Gem::Requirement
|
|
106
146
|
none: false
|
|
107
147
|
requirements:
|
|
108
148
|
- - ! '>='
|
|
@@ -110,10 +150,15 @@ dependencies:
|
|
|
110
150
|
version: '0'
|
|
111
151
|
type: :development
|
|
112
152
|
prerelease: false
|
|
113
|
-
version_requirements:
|
|
153
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
154
|
+
none: false
|
|
155
|
+
requirements:
|
|
156
|
+
- - ! '>='
|
|
157
|
+
- !ruby/object:Gem::Version
|
|
158
|
+
version: '0'
|
|
114
159
|
- !ruby/object:Gem::Dependency
|
|
115
160
|
name: rake-compiler
|
|
116
|
-
requirement:
|
|
161
|
+
requirement: !ruby/object:Gem::Requirement
|
|
117
162
|
none: false
|
|
118
163
|
requirements:
|
|
119
164
|
- - ! '>='
|
|
@@ -121,10 +166,15 @@ dependencies:
|
|
|
121
166
|
version: '0'
|
|
122
167
|
type: :development
|
|
123
168
|
prerelease: false
|
|
124
|
-
version_requirements:
|
|
169
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
170
|
+
none: false
|
|
171
|
+
requirements:
|
|
172
|
+
- - ! '>='
|
|
173
|
+
- !ruby/object:Gem::Version
|
|
174
|
+
version: '0'
|
|
125
175
|
- !ruby/object:Gem::Dependency
|
|
126
176
|
name: rspec
|
|
127
|
-
requirement:
|
|
177
|
+
requirement: !ruby/object:Gem::Requirement
|
|
128
178
|
none: false
|
|
129
179
|
requirements:
|
|
130
180
|
- - ! '>='
|
|
@@ -132,10 +182,15 @@ dependencies:
|
|
|
132
182
|
version: '0'
|
|
133
183
|
type: :development
|
|
134
184
|
prerelease: false
|
|
135
|
-
version_requirements:
|
|
185
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
186
|
+
none: false
|
|
187
|
+
requirements:
|
|
188
|
+
- - ! '>='
|
|
189
|
+
- !ruby/object:Gem::Version
|
|
190
|
+
version: '0'
|
|
136
191
|
- !ruby/object:Gem::Dependency
|
|
137
192
|
name: simplecov
|
|
138
|
-
requirement:
|
|
193
|
+
requirement: !ruby/object:Gem::Requirement
|
|
139
194
|
none: false
|
|
140
195
|
requirements:
|
|
141
196
|
- - ! '>='
|
|
@@ -143,10 +198,15 @@ dependencies:
|
|
|
143
198
|
version: '0'
|
|
144
199
|
type: :development
|
|
145
200
|
prerelease: false
|
|
146
|
-
version_requirements:
|
|
201
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
202
|
+
none: false
|
|
203
|
+
requirements:
|
|
204
|
+
- - ! '>='
|
|
205
|
+
- !ruby/object:Gem::Version
|
|
206
|
+
version: '0'
|
|
147
207
|
- !ruby/object:Gem::Dependency
|
|
148
208
|
name: yard
|
|
149
|
-
requirement:
|
|
209
|
+
requirement: !ruby/object:Gem::Requirement
|
|
150
210
|
none: false
|
|
151
211
|
requirements:
|
|
152
212
|
- - ! '>='
|
|
@@ -154,7 +214,12 @@ dependencies:
|
|
|
154
214
|
version: '0'
|
|
155
215
|
type: :development
|
|
156
216
|
prerelease: false
|
|
157
|
-
version_requirements:
|
|
217
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
218
|
+
none: false
|
|
219
|
+
requirements:
|
|
220
|
+
- - ! '>='
|
|
221
|
+
- !ruby/object:Gem::Version
|
|
222
|
+
version: '0'
|
|
158
223
|
description: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for
|
|
159
224
|
Ruby.
|
|
160
225
|
email:
|
|
@@ -434,7 +499,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
434
499
|
version: '0'
|
|
435
500
|
segments:
|
|
436
501
|
- 0
|
|
437
|
-
hash:
|
|
502
|
+
hash: 1188177477206962012
|
|
438
503
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
439
504
|
none: false
|
|
440
505
|
requirements:
|
|
@@ -443,93 +508,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
443
508
|
version: '0'
|
|
444
509
|
segments:
|
|
445
510
|
- 0
|
|
446
|
-
hash:
|
|
511
|
+
hash: 1188177477206962012
|
|
447
512
|
requirements: []
|
|
448
513
|
rubyforge_project:
|
|
449
|
-
rubygems_version: 1.8.
|
|
514
|
+
rubygems_version: 1.8.24
|
|
450
515
|
signing_key:
|
|
451
516
|
specification_version: 3
|
|
452
517
|
summary: Google Protocol Buffers v2.4.1 Serialization and RPC implementation for Ruby.
|
|
453
|
-
test_files:
|
|
454
|
-
- spec/benchmark/tasks.rb
|
|
455
|
-
- spec/functional/embedded_service_spec.rb
|
|
456
|
-
- spec/functional/evented_server_spec.rb
|
|
457
|
-
- spec/functional/socket_server_spec.rb
|
|
458
|
-
- spec/functional/zmq_server_spec.rb
|
|
459
|
-
- spec/lib/protobuf/cli_spec.rb
|
|
460
|
-
- spec/lib/protobuf/enum_spec.rb
|
|
461
|
-
- spec/lib/protobuf/enum_value_spec.rb
|
|
462
|
-
- spec/lib/protobuf/field/int32_field_spec.rb
|
|
463
|
-
- spec/lib/protobuf/logger_spec.rb
|
|
464
|
-
- spec/lib/protobuf/message_spec.rb
|
|
465
|
-
- spec/lib/protobuf/rpc/client_spec.rb
|
|
466
|
-
- spec/lib/protobuf/rpc/connector_spec.rb
|
|
467
|
-
- spec/lib/protobuf/rpc/connectors/base_spec.rb
|
|
468
|
-
- spec/lib/protobuf/rpc/connectors/common_spec.rb
|
|
469
|
-
- spec/lib/protobuf/rpc/connectors/socket_spec.rb
|
|
470
|
-
- spec/lib/protobuf/rpc/connectors/zmq_spec.rb
|
|
471
|
-
- spec/lib/protobuf/rpc/servers/evented_server_spec.rb
|
|
472
|
-
- spec/lib/protobuf/rpc/servers/socket_server_spec.rb
|
|
473
|
-
- spec/lib/protobuf/rpc/servers/zmq/broker_spec.rb
|
|
474
|
-
- spec/lib/protobuf/rpc/servers/zmq/server_spec.rb
|
|
475
|
-
- spec/lib/protobuf/rpc/servers/zmq/util_spec.rb
|
|
476
|
-
- spec/lib/protobuf/rpc/servers/zmq/worker_spec.rb
|
|
477
|
-
- spec/lib/protobuf/rpc/service_dispatcher_spec.rb
|
|
478
|
-
- spec/lib/protobuf/rpc/service_filters_spec.rb
|
|
479
|
-
- spec/lib/protobuf/rpc/service_spec.rb
|
|
480
|
-
- spec/lib/protobuf_spec.rb
|
|
481
|
-
- spec/spec_helper.rb
|
|
482
|
-
- spec/support/all.rb
|
|
483
|
-
- spec/support/packed_field.rb
|
|
484
|
-
- spec/support/server.rb
|
|
485
|
-
- spec/support/test/enum.pb.rb
|
|
486
|
-
- spec/support/test/enum.proto
|
|
487
|
-
- spec/support/test/resource.pb.rb
|
|
488
|
-
- spec/support/test/resource.proto
|
|
489
|
-
- spec/support/test/resource_service.rb
|
|
490
|
-
- spec/support/test_app_file.rb
|
|
491
|
-
- spec/support/tolerance_matcher.rb
|
|
492
|
-
- test/data/data.bin
|
|
493
|
-
- test/data/data_source.py
|
|
494
|
-
- test/data/types.bin
|
|
495
|
-
- test/data/types_source.py
|
|
496
|
-
- test/data/unk.png
|
|
497
|
-
- test/proto/addressbook.pb.rb
|
|
498
|
-
- test/proto/addressbook.proto
|
|
499
|
-
- test/proto/addressbook_base.pb.rb
|
|
500
|
-
- test/proto/addressbook_base.proto
|
|
501
|
-
- test/proto/addressbook_ext.pb.rb
|
|
502
|
-
- test/proto/addressbook_ext.proto
|
|
503
|
-
- test/proto/collision.pb.rb
|
|
504
|
-
- test/proto/collision.proto
|
|
505
|
-
- test/proto/ext_collision.pb.rb
|
|
506
|
-
- test/proto/ext_collision.proto
|
|
507
|
-
- test/proto/ext_range.pb.rb
|
|
508
|
-
- test/proto/ext_range.proto
|
|
509
|
-
- test/proto/float_default.proto
|
|
510
|
-
- test/proto/lowercase.pb.rb
|
|
511
|
-
- test/proto/lowercase.proto
|
|
512
|
-
- test/proto/merge.pb.rb
|
|
513
|
-
- test/proto/merge.proto
|
|
514
|
-
- test/proto/nested.pb.rb
|
|
515
|
-
- test/proto/nested.proto
|
|
516
|
-
- test/proto/optional_field.pb.rb
|
|
517
|
-
- test/proto/optional_field.proto
|
|
518
|
-
- test/proto/packed.pb.rb
|
|
519
|
-
- test/proto/packed.proto
|
|
520
|
-
- test/proto/rpc.proto
|
|
521
|
-
- test/proto/types.pb.rb
|
|
522
|
-
- test/proto/types.proto
|
|
523
|
-
- test/test_addressbook.rb
|
|
524
|
-
- test/test_enum_value.rb
|
|
525
|
-
- test/test_extension.rb
|
|
526
|
-
- test/test_lowercase.rb
|
|
527
|
-
- test/test_message.rb
|
|
528
|
-
- test/test_optional_field.rb
|
|
529
|
-
- test/test_packed_field.rb
|
|
530
|
-
- test/test_parse.rb
|
|
531
|
-
- test/test_repeated_types.rb
|
|
532
|
-
- test/test_serialize.rb
|
|
533
|
-
- test/test_standard_message.rb
|
|
534
|
-
- test/test_types.rb
|
|
518
|
+
test_files: []
|
|
535
519
|
has_rdoc:
|