zoomq 0.2.0 → 0.2.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +0 -2
- data/lib/zoomq/cli.rb +2 -2
- data/lib/zoomq/console.rb +6 -2
- data/lib/zoomq/server.rb +1 -0
- data/lib/zoomq/server/connection.rb +5 -5
- data/templates/gitignore.tt +2 -1
- data/templates/ping_request.rb.tt +3 -5
- data/templates/protocol.proto.tt +1 -1
- data/templates/server.rb.tt +3 -1
- data/zoomq.gemspec +1 -1
- metadata +2 -2
data/Gemfile
CHANGED
data/lib/zoomq/cli.rb
CHANGED
@@ -71,9 +71,9 @@ module ZooMQ
|
|
71
71
|
"lib/#{name}/protocol.proto" => "protocol.proto",
|
72
72
|
"lib/#{name}/protocol.rb" => "protocol.rb",
|
73
73
|
"lib/#{name}/client.rb" => "client.rb",
|
74
|
-
"
|
74
|
+
"#{name}/console.rb" => "console.rb",
|
75
75
|
"#{name}/server.rb" => "server.rb",
|
76
|
-
"#{name}/
|
76
|
+
"#{name}/server/ping_request.rb" => "ping_request.rb",
|
77
77
|
}.each do |dest, source|
|
78
78
|
puts " * #{dest}"
|
79
79
|
source = File.join(@root, 'templates', "#{source}.tt")
|
data/lib/zoomq/console.rb
CHANGED
@@ -11,15 +11,18 @@ end
|
|
11
11
|
module ZooMQ
|
12
12
|
class Console
|
13
13
|
def initialize
|
14
|
-
|
14
|
+
ZMachine.logger = $log
|
15
15
|
Thread.new { zmachine }
|
16
|
-
Ripl.start(binding: binding)
|
17
16
|
end
|
18
17
|
|
19
18
|
def zmachine
|
20
19
|
ZMachine.run { client }
|
21
20
|
end
|
22
21
|
|
22
|
+
def run
|
23
|
+
Ripl.start(binding: binding)
|
24
|
+
end
|
25
|
+
|
23
26
|
def method_missing(name, *args, &block)
|
24
27
|
result = nil
|
25
28
|
df = @client.send(name, *args, &block)
|
@@ -30,5 +33,6 @@ module ZooMQ
|
|
30
33
|
end
|
31
34
|
result
|
32
35
|
end
|
36
|
+
|
33
37
|
end
|
34
38
|
end
|
data/lib/zoomq/server.rb
CHANGED
@@ -11,7 +11,10 @@ module ZooMQ
|
|
11
11
|
def receive_data(msg)
|
12
12
|
origin = msg.unwrap
|
13
13
|
request_id = msg.unwrap
|
14
|
+
$log.debug("zoomq:request", id: String.from_java_bytes(request_id.data), from: String.from_java_bytes(origin.data))
|
14
15
|
result = handle_msg(msg)
|
16
|
+
$log.debug("zoomq:request", result: result.inspect)
|
17
|
+
result = ZMsg.new_string_msg(result.class.to_s, result.to_s)
|
15
18
|
result.wrap(request_id)
|
16
19
|
result.wrap(origin)
|
17
20
|
send_data(result)
|
@@ -21,13 +24,10 @@ module ZooMQ
|
|
21
24
|
def handle_msg(msg)
|
22
25
|
cls = String.from_java_bytes(msg.pop.data).constantize
|
23
26
|
request = cls.parse(String.from_java_bytes(msg.pop.data))
|
24
|
-
|
27
|
+
$log.debug("zoomq:request", cls: cls, request: request, handler: request.respond_to?(:handle))
|
28
|
+
request.handle(@server)
|
25
29
|
end
|
26
30
|
|
27
|
-
def handle_request(request)
|
28
|
-
result = request.handle(@server)
|
29
|
-
ZMsg.new_string_msg(result.class.to_s, result.to_s)
|
30
|
-
end
|
31
31
|
end
|
32
32
|
end
|
33
33
|
end
|
data/templates/gitignore.tt
CHANGED
data/templates/protocol.proto.tt
CHANGED
data/templates/server.rb.tt
CHANGED
@@ -2,12 +2,14 @@
|
|
2
2
|
|
3
3
|
require 'zoomq/server'
|
4
4
|
|
5
|
+
require '<%=config[:name]%>/protocol'
|
6
|
+
|
5
7
|
Dir[File.join(ROOT, '<%=config[:name]%>', 'server', '*.rb')].each do |f|
|
6
8
|
require f
|
7
9
|
end
|
8
10
|
|
9
11
|
module <%=config[:constant_name]%>
|
10
|
-
class Server
|
12
|
+
class Server < ZooMQ::Server
|
11
13
|
|
12
14
|
def service_name
|
13
15
|
<%=config[:name].inspect%>
|
data/zoomq.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |spec|
|
4
4
|
spec.name = "zoomq"
|
5
|
-
spec.version = "0.2.
|
5
|
+
spec.version = "0.2.1"
|
6
6
|
spec.authors = ["madvertise Mobile Advertising GmbH"]
|
7
7
|
spec.email = ["tech@madvertise.com"]
|
8
8
|
spec.description = %q{ØMQ ROUTER/ROUTER coordinated by Zookeeper}
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: zoomq
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.1
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-08-
|
12
|
+
date: 2013-08-28 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: erubis
|