gilmour 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb536ca3fba5d81c5ab8ae282e7eeb3a6b1cefe
-  data.tar.gz: 543fd382d9c4e3176cab664c7a10fe839775740d
+  metadata.gz: c364692b979b412f2e2057183e53a13c418a127c
+  data.tar.gz: 6a2dd4dcd850f82820c5c9fa4708dff3e3ab283b
 SHA512:
-  metadata.gz: cd60a017a32fb69becd5a751cb9a2f06189244cac16910638469168b3123611c1fe39c20913a81fedd54d8323d455b455f1fdb76da7a10ce5ae7f1c4406dc59d
-  data.tar.gz: 8816bde67db14712c95f62c3970308615a1d25d82ec63a8b26ac6fca18575a5be48f5ff7744039ceea664c3728888d8f8133c11b008e1d42d29647d697edefa2
+  metadata.gz: 5d4c63124e0f0a55666e8e081207386b591f10daaa0d5cf8cd093638343cd8645e468c4b034b67119c4f76bc13b054b4da80674f3470642fb4cd833d1b7a7140
+  data.tar.gz: 9fbf7269fdcddb0eecb61a358e6bf2ca1727afa81b12d6c16a34b21a783f970d9ee7c4dbfbcee677d0dff43e464b079e977aed7ac882149da5cf1b76bb8d67e9

data/lib/gilmour/backends/redis.rb

@@ -125,7 +125,7 @@ module Gilmour
     end
 
     def publish_error(messsage)
-      @publisher.publish(Gilmour::ErrorChannel, messsage)
+      publish(messsage, Gilmour::ErrorChannel)
     end
 
     def queue_error(key, message)

data/lib/gilmour/responder.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-require "logger"
+require 'json'
+require 'logger'
 
 # Top level module
 module Gilmour
@@ -147,21 +148,21 @@ module Gilmour
       end
     end
 
-    def emit_error(message, code=500, extra={})
-      # Publish all errors on gilmour.error
-      # This may or may not have a listener based on the configuration
-      # supplied at setup.
+    # Publish all errors on gilmour.error
+    # This may or may not have a listener based on the configuration
+    # supplied at setup.
+    def emit_error(message, code = 500, extra = {})
       opts = {
-        :topic => @request[:topic],
-        :data => @request[:data],
-        :description => '',
-        :sender => @sender,
-        :multi_process => @multi_process,
-        :code => 500
-      }.merge(extra || {})
-
-      opts[:timestamp] = Time.now.getutc
-      payload = {:traceback => message, :extra => opts, :code => code}
+        topic: @request.topic,
+        request_data: @request.body,
+        userdata: JSON.generate(extra || {}),
+        sender: @sender,
+        multi_process: @multi_process,
+        timestamp: Time.now.getutc
+      }
+
+      payload = { backtrace: message, code: code }
+      payload.merge!(opts)
       @backend.emit_error payload
     end
 

data/test/spec/test_subscriber_redis.rb

@@ -118,6 +118,33 @@ describe 'TestSubscriber' do
       end
     end
 
+    context 'Exception data' do
+      Given(:ping_opts) do
+        redis_ping_options
+      end
+
+      When(:sub) do
+        Gilmour::RedisBackend.new({})
+      end
+      When(:code) do
+        waiter_error = Waiter.new
+        code = nil
+
+        error_listener_proc = sub.add_listener Gilmour::ErrorChannel do
+          code = request.body.code
+          waiter_error.signal
+        end
+
+        sub.publish(3, TestSubscriber::TimeoutTopic)
+        waiter_error.wait(5)
+        sub.remove_listener Gilmour::ErrorChannel, error_listener_proc
+        code
+      end
+      Then do
+        code.should be == 504
+      end
+    end
+
     context 'Handler sleeps longer than the Timeout' do
       Given(:ping_opts) do
         redis_ping_options

data/test/spec/test_subscriber_redis_forked.rb

@@ -128,6 +128,33 @@ describe 'TestSubscriberFork' do
       end
     end
 
+    context 'Exception data' do
+      Given(:ping_opts) do
+        redis_ping_options
+      end
+
+      When(:sub) do
+        Gilmour::RedisBackend.new({})
+      end
+      When(:code) do
+        waiter_error = Waiter.new
+        code = nil
+
+        error_listener_proc = sub.add_listener Gilmour::ErrorChannel do
+          code = request.body.code
+          waiter_error.signal
+        end
+
+        sub.publish(3, TestSubscriber::TimeoutTopic)
+        waiter_error.wait(5)
+        sub.remove_listener Gilmour::ErrorChannel, error_listener_proc
+        code
+      end
+      Then do
+        code.should be == 504
+      end
+    end
+
     context 'Handler sleeps longer than the Timeout' do
       Given(:ping_opts) do
         redis_ping_options

data/version.rb

@@ -1,3 +1,3 @@
 module Gilmour
-    VERSION = '0.2.7'
+    VERSION = '0.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gilmour
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Aditya Godbole
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec