filbunke 1.1.0 → 1.1.1

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/doc/examples/filbunke_config.yml

@@ -1,18 +1,18 @@
 ---
 pid_file: '/var/run/filbunked.pid'
-user: 'bjorns'
+user: 'daemon_user'
 log_file: '/tmp/filbunke.log'
 checkpoint_path: '/var/tmp/filbunke_checkpoints/'
 run_every: 5
-callback_path: '/Users/bjorns/Documents/Development/filbunke-cdn/client/doc/examples/'
+callback_path: '/path/to/filebunke/config.yml'
 repositories:
     cache:
         local_path: '/v5/cachetest'
-        filbunke_server_host: 'localhost'
+        filbunke_server_host: 'spebbe.local'
         filbunke_server_port: 8080
         filbunke_server_repository: 'cache'
         file_url_username: 'content'
-        file_url_password: 'JeSuisContent#1'
+        file_url_password: 'contentpassword'
         file_umask: 0644
         directory_umask: 0755
         callbacks:

data/filbunke.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{filbunke}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie"]

data/lib/filbunke/client.rb

@@ -24,20 +24,25 @@ module Filbunke
     def with_updated_files(last_checkpoint)
       updates = get_updated_file_list(last_checkpoint)
       updated_files = updates["files"] || []
+      failure = false
       updated_files.each do |raw_file|
         file = File.new(raw_file)
         if file.url.start_with?("http://")
           local_file_path = ::File.join(repository.local_path, file.path)
-          update_http_file!(file, local_file_path)
-          @callbacks.each do |callback|
-            callback.on_update(file)
+          if update_http_file!(file, local_file_path) then
+            @callbacks.each do |callback|
+              callback.on_update(file)
+            end
+            yield file
+          else
+            @logger.log "Unable to get file #{file.url}/#{file.path}!"
+            failure = true
           end
-          yield file
         else
           raise "Unsupported protocol for file: #{file.inspect}"
         end
       end
-      updates["checkpoint"] || last_checkpoint
+      failure ? last_checkpoint : (updates["checkpoint"] || last_checkpoint)
     end
 
     def update_files!(last_checkpoint)
@@ -74,18 +79,24 @@ module Filbunke
     def get_updated_file_list(last_checkpoint)
       updates_http = Net::HTTP.new(@repository.host, @repository.port)
       updates_http.start do |http|
+        begin
         updates_path = "/#{UPDATES_ACTION}/#{@repository.name}?#{FROM_CHECKPOINT_KEY}=#{last_checkpoint}"
         request = Net::HTTP::Get.new(updates_path)
         response = http.request(request)
         if response.code.to_i == 200
           JSON.parse(response.body)
         else
-          raise "Failed to download updates for #{@repository.name}, error code = #{response.code}"
+          @logger.log "Failed to download updates for #{@repository.name}, error code = #{response.code}"
+        end
+        rescue StandardError => e
+          @logger.log "Error getting file list: #{e.message}! Retrying later.."
+          {}
         end
       end
     end
 
     def update_http_file!(file, local_file_path)
+      begin
       uri = URI.parse(file.url)
       file_http=Net::HTTP.new(uri.host, uri.port)
       file_http.start do |http|
@@ -97,9 +108,14 @@ module Filbunke
         elsif response.code.to_i == 404
           delete_file!(local_file_path)
         else
-          raise "Failed to update file #{uri}, error code = #{response.code}"
+          @logger.log "Failed to update file #{uri}, error code = #{response.code}"
         end
+        return true
+      end
+      rescue StandardError => e
+        return false
       end
+      
     end
 
     def write_file!(file_path, contents)

data/lib/filbunke/daemon.rb

@@ -53,7 +53,7 @@ module Filbunke
     end
 
     def update_checkpoint_for_repository(repository, checkpoint)
-      @logger.log("Updating checkpoint for: #{repository.name}")
+      @logger.log("Updating checkpoint for: #{repository.name} to #{checkpoint}.")
       f = ::File.new(checkpoint_file_name_for_repository(repository), 'w', repository.file_umask)
       f.write(checkpoint)
       f.close

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Wouter de Bie