fluent-plugin-in-websocket 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b75655a588094e89cdabd7789663717c9e8c1c
-  data.tar.gz: f9ad787cafb8f147e1632dbdd57bf5c56d05db4c
+  metadata.gz: dd6d8ba597e13256344d8b2d85bdd883ec1269d6
+  data.tar.gz: 319a3cf40c5239e9e6bd35539dc7007e25bb228a
 SHA512:
-  metadata.gz: c70fdc5d03dc99726f179a3b19d624dcb1e1a8f77c25b972ef41ec993a9c2f83380498876717beef20c80358d5458a3bccc6ea85226aa27e9809ac4e357810cb
-  data.tar.gz: efaab6b0371fed610ae5eec4ceb5e7758d3e7ff3d21578b494350c91e9cbd9ba311e6fd0f815fc55c894837ec66a3b9d13e0e3e6010b95e371130a5147c8bf18
+  metadata.gz: 1694545912a88ce6555c7c03cc03a96eb76028b522beb0caa5bc4f425029811983cfc1b3d43d06c1d1047a401015bc7140f69e61f74e1ff1358d2c117dba8a21
+  data.tar.gz: 184d36d9f254a7b8392c815c4b513f2b00d45a3e9baf4c12c1d70bd856f0e21ab86db3589d8b18b5afa8556ebb30f7c1b38eff34c50bd9c6cb67afc576df1f15

data/fluent-plugin-in-websocket.gemspec

@@ -4,12 +4,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-in-websocket"
-  spec.version       = "0.1.1"
+  spec.version       = "0.1.2"
   spec.authors       = ["Sebastian Szewczyk"]
   spec.email         = ["sebryu@gmail.com"]
 
   spec.summary       = "Fluent plugin for websocket input"
-  spec.description   = "Fluent plugin that uses em-websocket as input, not tested yet"
+  spec.description   = "Fluent plugin that uses em-websocket as input. Don't have tests yet, but it works for me. For more info visit homepage https://github.com/sebryu/fluent_plugin_in_websocket."
   spec.homepage      = "https://github.com/sebryu/fluent_plugin_in_websocket"
   spec.license       = "MIT"
 

data/lib/fluent/plugin/in_websocket.rb

@@ -9,47 +9,52 @@ module Fluent
 
     # config_param defines a parameter. You can refer a parameter via @port instance variable
     # :default means this parameter is optional
-    config_param :port, :integer, default: '8080'
-    config_param :host, :integer, default: '127.0.0.1'
+    config_param :port, :integer, default: 8080
+    config_param :host, :string, default: '127.0.0.1'
 
     # This method is called before starting.
     # 'conf' is a Hash that includes configuration parameters.
     # If the configuration is invalid, raise Fluent::ConfigError.
     def configure(conf)
       super
-
-      # You can also refer to raw parameter via conf[name].
-      @port = conf['port']
-      @host = conf['host']
     end
 
     # This method is called when starting.
     # Open sockets or files and create a thread here.
     def start
       super
-      Thread.new(&method(:run))
+      @thread = Thread.new do
+        run
+      end
+    end
+
+    def log_message text
+      $log.info text
     end
 
     def run
       EM.run {
+        log_message "EM will be runned on #{@host}:#{@port}"
         EM::WebSocket.run(host: @host, port: @port) do |ws|
           ws.onopen { |handshake|
-            puts "WebSocket connection open"
-
-            # Access properties on the EM::WebSocket::Handshake object, e.g.
-            # path, query_string, origin, headers
-
-            # Publish message to the client
+            log_message "WebSocket connection open"
             ws.send "Hello Client, you connected to #{handshake.path}"
           }
 
-          ws.onclose { puts "Connection closed" }
+          ws.onerror { |e|
+            log_message "error occured"
+            log_message "error: #{e}"
+           }
+
+          ws.onclose { |e|
+            log_message "Connection closed"
+            log_message "reason: #{e}"
+           }
 
           ws.onmessage { |msg|
-            puts "Recieved message: #{msg}"
+            log_message "Recieved message: #{msg}"
             data = JSON.parse(msg)
-            router.emit(data.label, Engine.now, data.record)
-
+            router.emit(data['label'], Engine.now, data['record'])
             ws.send "Pong: #{msg}"
           }
         end
@@ -59,7 +64,10 @@ module Fluent
     # This method is called when shutting down.
     # Shutdown the thread and close sockets or files here.
     def shutdown
-      puts 'SHOULD CLOSE DOWN CONNECTION'
+      super
+      EM.stop
+      Thread::kill(@thread)
+      log_message 'closed EM and thread'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-in-websocket
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sebastian Szewczyk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
-description: Fluent plugin that uses em-websocket as input, not tested yet
+description: Fluent plugin that uses em-websocket as input. Don't have tests yet,
+  but it works for me. For more info visit homepage https://github.com/sebryu/fluent_plugin_in_websocket.
 email:
 - sebryu@gmail.com
 executables: []