gerouter 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85849ab81ec85537822c1e48209579e06a37a7d9
-  data.tar.gz: ce95d3cf8fb70c327af70b23d32afa2951a3eb75
+  metadata.gz: 1ffa5260b088999cbd6775357a9cdc365a2ab446
+  data.tar.gz: edb5889deeb82037ef75ce961c1fcc77bfdbfc16
 SHA512:
-  metadata.gz: 4a46246eba0561be155810e4aa695b2d7928b86fddf4e28e1944605ce81a16b08863f42d66ba2aa99503aae3083e315bfc8f4b0d490c772529762eecc5eb52b0
-  data.tar.gz: c2ce83ef9c6f9d32443dd242cdad14001741428255b65606a83ec1121fe85302dbc88a696f61c4c1c802abc9c12700b1fb8b2ac0570ca8a83914d97bea858e89
+  metadata.gz: 2f182e4e547e4dfeaae3f91477f76f6bfc495d7c4980bab1842fefa2eae310195cfadc46936e843b3838e016a897281b2a75ac4d6fc4c24fc9abb61155eac13f
+  data.tar.gz: baf35a7f00b53c0d90969bb44c72b491e6b5fdc1f1783afadefc46976860dac8d9175564c2489412956b4668d066dd0bbc1c0773eb10953b21c71a69316b0e8d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gerouter (0.0.6)
+    gerouter (0.0.8)
       amqp
       em-ssh
       eventmachine

data/README.md

@@ -47,6 +47,7 @@ Usage: gerouter [options]
     -d, --debug                      Debug mode
     -c, --config CONFIGFILE          Path to config file
     -n, --name NAME                  Name of gerrit
+    -i, --appid APPID                Application ID (default: gerouter)
 ```
 
 You should specify -c and -n options.
@@ -100,11 +101,22 @@ The above is also stored in [here][samples].
 * `broker` in gerrit has the broker name
 * gerrits can share one broker 
 
+Additional properties
+---------------------------
+
+gerouter adds some properties into each messages.
+
+```yaml
+content_type: application/json
+app_id: gerouter
+```
+
+You can change app_id to your own id using `-i` option.
 
 Additional attribute in Gerrit event
 ---------------------------
 
-As below, gerouter adds `misc` attribute into Gerrit event then send to broker.
+As below, gerouter adds `provider` attribute into Gerrit event then send to broker.
 
 ```json
 {

data/bin/gerouter

@@ -25,6 +25,9 @@ begin
     opt.on('-n NAME', '--name', 'Name of gerrit') do |v|
       OPTS[:name] = v
     end
+    opt.on('-i APPID', '--appid', "Application ID (default: #{GER::NAME.downcase})") do |v|
+      OPTS[:app_id] = v
+    end
     opt.parse(ARGV)
   end
 
@@ -33,7 +36,7 @@ begin
   conf = GER.load_config(OPTS[:config]||"#{GER::CONFIG_NAME}")
 
   if OPTS[:name]
-    GER.start(OPTS[:name], conf)
+    GER.start(OPTS[:name], OPTS[:app_id], conf)
   else
     STDOUT.puts conf.names
   end

data/lib/ger/router.rb

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 module GerritEventRouter
   class Router
-    def initialize(name, config)
+    def initialize(name, appid, config)
       @name = name
+      @appid = appid
       begin
         @gerrit = config.gerrits[name]
         raise "Gerrit name is not found: #{name}" unless @gerrit
@@ -21,17 +22,23 @@ module GerritEventRouter
       raise "Router still not be configured" unless @configured
 
       Signal.trap(:INT) do
-        GER.logger.info "Receive signal: INT. terminating."
+        Thread.new do
+          GER.logger.info "Receive signal: INT. terminating."
+        end
         EM.stop
       end
 
       Signal.trap(:TERM) do
-        GER.logger.info "Receive signal: TERM. terminating."
+        Thread.new do
+          GER.logger.info "Receive signal: TERM. terminating."
+        end
         EM.stop
       end
 
       Signal.trap(:USR2) do
-        GER.logger.debug "Receive signal: USR2"
+        Thread.new do
+          GER.logger.debug "Receive signal: USR2"
+        end
         if GER.logger.level == GER::LOG_NORMAL then
           GER.logger.level = GER::LOG_DEBUG
         else
@@ -83,7 +90,7 @@ module GerritEventRouter
                       json["provider"] = provider
                       str = JSON.generate(json)
                     end
-                    broker.send(str, :routing_key => @gerrit.routing_key)
+                    broker.send(str, :app_id => @appid, :routing_key => @gerrit.routing_key)
                   end
                 end
               end

data/lib/ger/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module GerritEventRouter
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/ger.rb

@@ -23,8 +23,8 @@ module GerritEventRouter
       Config.new.load(path)
     end
 
-    def start(name, config)
-      router = Router.new(name, config)
+    def start(name, appid, config)
+      router = Router.new(name, appid, config)
       router.start
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gerouter
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - rinrinne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine