- Move all messages to use MQRPC

lib/net/messages/broadcast.rb

@@ -1,19 +1,7 @@
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class BroadcastMessage < RequestMessage
-    register
-
-    # Message attributes
-    hashbind :queue, "/args/queue"
-
+  class BroadcastMessage < MQRPC::Message
+    argument :queue
   end # class BroadcastRequest
-
-#  class BroadcastResponse < ResponseMessage
-#    register
-#
-#    # Message attributes
-#    hashbind :results, "/args/results"
-#    hashbind :finished, "/args/finished"
-#  end # class BroadcastResponse
 end; end; end # module LogStash::Net::Messages

lib/net/messages/directory.rb

@@ -1,16 +1,11 @@
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class DirectoryRequest < RequestMessage
-    register
-
+  class DirectoryRequest < MQRPC::RequestMessage
     # No message attributes
-  end # class SearchRequest
+  end # class DirectoryRequest
 
-  class DirectoryResponse < ResponseMessage
-    register
-
-    # Message attributes
-    hashbind :indexers, "/args/results"
-  end # class SearchResponse
+  class DirectoryResponse < MQRPC::ResponseMessage
+    argument :indexers
+  end # class DirectoryResponse
 end; end; end # module LogStash::Net::Messages

lib/net/messages/indexevent.rb

@@ -1,26 +1,20 @@
-
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class IndexEventRequest < RequestMessage
-    register
+  class IndexEventRequest < MQRPC::RequestMessage
+    argument :log_type
+    argument :log_data
+    argument :metadata
 
     def initialize
       super
       self.metadata = Hash.new
     end
-
-    hashbind :log_type, "/args/type"
-    hashbind :log_data, "/args/message"
-    hashbind :metadata, "/args/metadata"
   end # class IndexEventRequest
 
-  class IndexEventResponse < ResponseMessage
-    register
-
-    # Message attributes
-    hashbind :code, "/args/code"
-    hashbind :error, "/args/error"
+  class IndexEventResponse < MQRPC::ResponseMessage
+    argument :code
+    argument :error
 
     def success?
       return self.code == 0

lib/net/messages/logkeys.rb

@@ -1,17 +1,11 @@
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class LogKeysRequest < RequestMessage
-    register
-
-    # Message attributes
-    hashbind :log_type, "/args/log_type"
+  class LogKeysRequest < MQRPC::RequestMessage
+    argument :log_type
   end # class LogKeysRequest
 
-  class LogKeysResponse < ResponseMessage
-    register
-
-    # Message attributes
-    hashbind :keys, "/args/keys"
+  class LogKeysResponse < MQRPC::ResponseMessage
+    argument :keys
   end # class LogKeysResponse
 end; end; end # module LogStash::Net::Messages

lib/net/messages/logtypes.rb

@@ -1,17 +1,12 @@
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class LogTypesRequest < RequestMessage
-    register
-
+  class LogTypesRequest < MQRPC::RequestMessage
     # No message attributes
   end # class LogTypesRequest
 
-  class LogTypesResponse < ResponseMessage
-    register
-
-    # Message attributes
-    hashbind :log_type, "/args/log_type"
-    hashbind :types, "/args/types"
+  class LogTypesResponse < MQRPC::ResponseMessage
+    argument :log_type
+    argument :types
   end # class LogTypesResponse
 end; end; end # module LogStash::Net::Messages

lib/net/messages/ping.rb

@@ -1,24 +1,16 @@
-
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class PingRequest < RequestMessage
-    register
+  class PingRequest < MQRPC::RequestMessage
+    argument :pingdata
 
     def initialize
       super
       self.pingdata = Time.now.to_f
     end
-
-    # Message attributes
-    hashbind :pingdata, "/args/pingdata"
-
   end # class PingRequest
 
-  class PingResponse < ResponseMessage
-    register
-
-    # Message attributes
-    hashbind :pingdata, "/args/pingdata"
+  class PingResponse < MQRPC::ResponseMessage
+    argument :pingdata
   end # class PingResponse
 end; end; end # module LogStash::Net::Messages

lib/net/messages/quit.rb

@@ -1,12 +1,11 @@
-
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class QuitRequest < RequestMessage
-    register
+  class QuitRequest < MQRPC::RequestMessage
+    # No attributes
   end # class QuitRequest
 
-  class QuitResponse < ResponseMessage
-    register
+  class QuitResponse < MQRPC::ResponseMessage
+    # No attributes
   end # class QuitResponse
 end; end; end # module LogStash::Net::Messages

lib/net/messages/search.rb

@@ -1,23 +1,16 @@
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class SearchRequest < RequestMessage
-    register
-
-    # Message attributes
-    hashbind :query, "/args/query"
-    hashbind :log_type, "/args/log_type"
-    hashbind :offset, "/args/offset"
-    hashbind :limit, "/args/limit"
+  class SearchRequest < MQRPC::RequestMessage
+    argument :query
+    argument :log_type
+    argument :offset
+    argument :limit
   end # class SearchRequest
 
-  class SearchResponse < ResponseMessage
-    register
-
-    # Message attributes
-    hashbind :results, "/args/results"
-    hashbind :indexer_id, "/args/indexer_id"
-    hashbind :finished, "/args/finished"
-
+  class SearchResponse < MQRPC::ResponseMessage
+    argument :results
+    argument :indexer_id
+    argument :finished
   end # class SearchResponse
 end; end; end # module LogStash::Net::Messages

lib/net/messages/searchhits.rb

@@ -1,20 +1,14 @@
-require "lib/net/message"
+require "mqrpc"
 
 module LogStash; module Net; module Messages
-  class SearchHitsRequest < RequestMessage
-    register
-
-    # Message attributes
-    hashbind :query, "/args/query"
-    hashbind :log_type, "/args/log_type"
-    hashbind :offset, "/args/offset"
-    hashbind :limit, "/args/limit"
+  class SearchHitsRequest < MQRPC::RequestMessage
+    argument :query
+    argument :log_type
+    argument :offset
+    argument :limit
   end # class SearchHitsRequest
 
-  class SearchHitsResponse < ResponseMessage
-    register
-
-    # Message attributes
-    hashbind :hits, "/args/hits"
+  class SearchHitsResponse < MQRPC::ResponseMessage
+    argument :hits
   end # class SearchHitsResponse
 end; end; end # module LogStash::Net::Messages