fluent-plugin-gcloud-pubsub-custom 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6a3dc4854e4b3d760150f6ba6e46513fd432d82
-  data.tar.gz: e79d3538b84e949c8754c4c40f429af5ccfb9b42
+  metadata.gz: bc9dc8d4003d063cc4e918c37dbda0ff9d5386be
+  data.tar.gz: b2fe919a6ef18270fb4641302318c9a7c60a6b70
 SHA512:
-  metadata.gz: 611d5fc134b67c6f51740beeab19fa2ee0fe1a001399fb3cbddb64b71a0187b5bcab8000dac1a007d0758de0d9923f838b424a8e95098e4c95783d6a192141e5
-  data.tar.gz: 8cd2edd9f32f283ba06686a102ee66af5a7c9d86811a86fe38491d336d431f2c85fc1caa21b387cc9328678897c380b1a00d7fca9610b2d412bf5c97542beb22
+  metadata.gz: f788632c81919ef4345813cffbab25299440047e8c4c0b47a1804d3c511fdd1f92b61b8e6f6caaef3d4a69bbfafd2da23e50ff640db94abb2dd1157cf641331d
+  data.tar.gz: 64494f35d1b8521982a12accc8ff95b52c5f5ed3718db0fe81a5e783751a72f6393d1d7ef328fa95c800812734d5f211ceab9bc28c93a6546ab9c99edd5a976d

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## ChangeLog
 
+### Release 0.4.3 - 2017/02/16
+
+- Input plugin
+  - Add "status" method to the http rpc api
+
 ### Release 0.4.2 - 2017/02/03
 
 - Make retry to get topic/subscription when Pub/Sub API returns 50x code

data/fluent-plugin-gcloud-pubsub-custom.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.license     = "MIT"
   gem.homepage    = "https://github.com/mia-0032/fluent-plugin-gcloud-pubsub-custom"
   gem.summary     = gem.description
-  gem.version     = "0.4.2"
+  gem.version     = "0.4.3"
   gem.authors     = ["Yoshihiro MIYAI"]
   gem.email       = "msparrow17@gmail.com"
   gem.has_rdoc    = false

data/lib/fluent/plugin/in_gcloud_pubsub.rb

@@ -92,15 +92,18 @@ module Fluent
       end
 
       def process(req, res)
+        ret = {'ok' => true}
         case req.path_info
         when '/stop'
           @plugin.stop_pull
         when '/start'
           @plugin.start_pull
+        when '/status'
+          ret['status'] = @plugin.status_of_pull
         else
           raise Error.new "Invalid path_info: #{req.path_info}"
         end
-        render_json(200, {'ok' => true})
+        render_json(200, ret)
       end
     end
 
@@ -159,6 +162,10 @@ module Fluent
       log.info "start pull from subscription:#{@subscription}"
     end
 
+    def status_of_pull
+      @stop_pull ? 'stopped' : 'started'
+    end
+
     private
 
     def static_tag(record)

data/test/plugin/test_in_gcloud_pubsub.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'json'
 
 require_relative "../test_helper"
 
@@ -355,5 +356,26 @@ class GcloudPubSubInputTest < Test::Unit::TestCase
         assert_equal({"foo" => "bar"}, record)
       end
     end
+
+    test 'get status by http rpc when started' do
+      d = create_driver("#{CONFIG}\npull_interval 1.0\nenable_rpc true")
+      assert_equal(false, d.instance.instance_variable_get(:@stop_pull))
+
+      d.run {
+        res = http_get('/api/in_gcloud_pubsub/pull/status')
+        assert_equal({"ok" => true, "status" => "started"}, JSON.parse(res.body))
+      }
+    end
+
+    test 'get status by http rpc when stopped' do
+      d = create_driver("#{CONFIG}\npull_interval 1.0\nenable_rpc true")
+      d.instance.stop_pull
+      assert_equal(true, d.instance.instance_variable_get(:@stop_pull))
+
+      d.run {
+        res = http_get('/api/in_gcloud_pubsub/pull/status')
+        assert_equal({"ok" => true, "status" => "stopped"}, JSON.parse(res.body))
+      }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-gcloud-pubsub-custom
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Yoshihiro MIYAI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd