rservicebus-beanstalk-webadmin 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d20b749e9747a5c231242ea64f8eeefca81383ab
-  data.tar.gz: ffafc56ae699cdc6dd9ab0c3d2438e789a4e9723
+  metadata.gz: ef6a92d49546266389c6e73c6349a98aa35163b7
+  data.tar.gz: e9ba210ce5624d73b334a2136e91567a6925e304
 SHA512:
-  metadata.gz: 34a6439cde238709413ee121305cf6170008be139016c3616bd4e8c399de70363a1d3b0b9d78eeba7188b3fee0a1065de9ddfb0ce8faa41f5a7d9f65caf3d2a5
-  data.tar.gz: 77ba23f56557a0852dff38871023aba5384733963ad0344b2e0ee0716cb11b1cb82198a75bc745766b64c701abb6b7101c5a76ef048cbe4a5f054c0ad43b76ee
+  metadata.gz: 94d71c9425e7ecb51d4c1723af34b90d206af3f3c9cf6512633e2fafb6b8c5b16d2d6472d3cf6d00d7f1c57d98c241a6a019d2ae532e52756c6f9b93f01c0dad
+  data.tar.gz: 1f0ebd68edf4983f5dd229bcfa35937921dcaf89fa9ae962993424105fe53f50fa90dd2526862eea5a39e3e6d37c0bf004acbf3a5fa92cb12a25778d0f30298e

data/lib/rservicebus-beanstalk-webadmin.rb

@@ -6,6 +6,7 @@ require 'sinatra'
 class RServiceBusBeanstalkAdmin < Sinatra::Base
 
 set :public_folder, File.expand_path('../../public', __FILE__)
+set :bind, '0.0.0.0'
 
 before do
   @host_string = ENV['BEANSTALK_HOST'] || 'localhost:11300'
@@ -17,6 +18,10 @@ after do
 end
 
 def convert_rservicebus2_msg_to_hash(idx, body)
+  if body.index('RServiceBus2::Message').nil?
+    return Hash['idx', 'id', 'error_list', []]
+  end
+
   msg_wrapper = YAML.load(body)
 
   hash = Hash['idx', idx,
@@ -32,10 +37,38 @@ def convert_rservicebus2_msg_to_hash(idx, body)
   end
 
   hash['name'] = body.match('ruby/object:([A-Za-z0-9_:]*?)[^A-Za-z0-9_:]',
-                            '-- !ruby/object:RServiceBus::Message'.length)[1]
+                            '-- !ruby/object:RServiceBus2::Message'.length)[1]
   hash
 end
 
+def convert_rservicebus_msg_to_hash(idx, body)
+  require 'RServiceBus'
+  msg_wrapper = YAML.load(body)
+
+  hash = Hash['idx', idx,
+              'msg_id', msg_wrapper.msg_id,
+              'return_address', msg_wrapper.return_address,
+              'error_list', []]
+
+  msg_wrapper.error_list.each do |e|
+    h = Hash['occurredat', e.occurredat,
+             'source_queue', e.source_queue,
+             'error_msg', e.error_msg]
+    hash['error_list'] << h
+  end
+
+  hash['name'] = body.match('ruby/object:([A-Za-z0-9_:]*?)[^A-Za-z0-9_:]',
+                            '-- !ruby/object:RServiceBus2::Message'.length)[1]
+  hash
+end
+
+def convert_msg_to_hash(idx, body)
+  return convert_rservicebus2_msg_to_hash(idx, body) unless body.index('RServiceBus2::Message').nil?
+  return convert_rservicebus_msg_to_hash(idx, body) unless body.index('RServiceBus::Message').nil?
+
+  Hash['idx', 'id', 'error_list', []]
+end
+
 get '/path' do
   puts File.expand_path('../../public', __FILE__)
 end
@@ -61,7 +94,7 @@ get '/tube/:name/list' do
     job = @beanstalk.reserve 1
     job_list << job
 
-    msg = convert_rservicebus2_msg_to_hash(idx, job.body)
+    msg = convert_msg_to_hash(idx, job.body)
     body_list << msg
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus-beanstalk-webadmin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Guy Irvine