fluent-plugin-feedly 0.0.2 → 0.0.3

data/README.md

@@ -7,7 +7,7 @@ Fluentd input plugin to fetch RSS/ATOM feed via feedly Cloud API.
 ## Dependencies
 
 * Ruby 1.9.3+
-* Fluentd 0.10.54+
+* Fluentd 0.10.55+
 
 ## Installation
 
@@ -19,6 +19,9 @@ $ gem install fluent-plugin-feedly
 
 # for td-agent
 $ sudo /usr/lib64/fluent/ruby/bin/fluent-gem install fluent-plugin-feedly
+
+# for td-agent2
+$ sudo td-agent-gem install fluent-plugin-feedly
 `````
 
 ## Configuration

data/fluent-plugin-feedly.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-feedly"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Kentaro Yoshida"]
   spec.email         = ["y.ken.studio@gmail.com"]
   spec.summary       = %q{Fluentd input plugin to fetch RSS/ATOM feed via feedly Cloud API.}

data/lib/fluent/plugin/in_feedly.rb

@@ -35,13 +35,11 @@ module Fluent
 
       @client = Feedlr::Client.new(
         oauth_access_token: @access_token,
-        sandbox: @enable_sandbox,
+        sandbox: @enable_sandbox
       )
     end
 
     def start
-      @profile_id = @client.user_profile.id
-      @state_store = StateStore.new(@state_file)
       @thread = Thread.new(&method(:run))
     end
 
@@ -54,26 +52,32 @@ module Fluent
       loop do
         begin
           fetch
+        rescue Feedlr::Error::Unauthorized, Feedlr::Error::Forbidden => e
+          log.error "Feedly: unrecoverable error has occoured.", error: e.message, error_class: e.class
+          log.error_backtrace e.backtrace
+          break
         rescue => e
-          log.error "Feedly: unexpected error has occoured.", error: e.message, error_class: e.class
+          log.error "Feedly: error has occoured. trying to retry after #{@run_interval} seconds.", error: e.message, error_class: e.class
           log.error_backtrace e.backtrace
           sleep @run_interval
           retry
         end
         sleep @run_interval
       end
+      log.error "Feedly: stopped fetching process due to the previous error."
     end
 
     def fetch
+      @profile_id ||= @client.user_profile.id
+      @state_store ||= StateStore.new(@state_file)
       @subscribe_categories.each do |category_name|
         category_id = "user/#{@profile_id}/category/#{category_name}"
         fetch_time_range = get_fetch_time_range
-        loop {
+        loop do
           request_option = { count: @fetch_count, continuation: get_continuation_id, newerThan: fetch_time_range }
           cursor = @client.stream_entries_contents(category_id, request_option)
           if cursor.items.nil?
-            log.error "Feedly: unexpected error has occoured.", cursor: cursor
-            break
+            return raise Feedlr::Error::ServerError, cursor
           end
           cursor.items.each do |item|
             Engine.emit(@tag, Engine.now, item)
@@ -81,7 +85,7 @@ module Fluent
           log.info "Feedly: fetched articles.", articles: cursor.items.size, request_option: request_option
           set_continuation_id(cursor.continuation)
           break if get_continuation_id.nil?
-        }
+        end
       end
     end
 
@@ -150,3 +154,4 @@ module Fluent
     end
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-feedly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd