filbunke 2.0.6 → 2.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzM1ZDBmN2E1YWJlZTk3NDQ0MTEyNzgzOWI4OTcxMzc4ZjZiYjkwNw==
+    OGM0Y2M5NDc0YTE1MzAxMmIxNjNjYmJkM2EwODA4YzY5MTQ4NDFhYQ==
   data.tar.gz: !binary |-
-    NzRiZDZhY2I1NDY3NGYxZWRhNzRlNTIyYjcxOGU1Y2JhNmEyNTA4MQ==
+    YjE3YzkxMzczZGIwOGFjMjFkZTYwYzc3YTUxNzk1ZTEyMGU4ZDZiMg==
 SHA512:
   metadata.gz: !binary |-
-    ZGM1OTUwODNkMWViODJiNzExMDgyNTgwZTNhZmIxZWMxMGRiYzZmMWM1ODhl
-    MjdhNGExODUwN2QyNDcyYmUzMDEwYzQ4YWY2ZWNiNjcxMGYzNzIwMGI3OTcx
-    NTUwNWFhNmU2MTJlMzJiZmM0YTI4MWQzNTRiNzAzNjMyMmFiODc=
+    ZTFmYzcyY2ZmNmZmOWQ3ZTFhNDEyYjJhZmU0YzZlOWI2Mzk1NTg2MGM5NGE1
+    OWNhODgxYTIwNTBjYTMxMWI2NGU3ZmFmOTNkNjE3MTg5ZmZmOWEyM2U5NGZi
+    NzI4ODQ3ZjU0ZDY1NWQ2MmM5MjI4MDVhNTI0ZjlmODc1MGU4NGQ=
   data.tar.gz: !binary |-
-    N2EwN2Q4NGY4NjUxNTQyMTM5NDdiNGRlNmRkZmYxYTUxMWY5YmYxZDU2NzJh
-    NGM0OGI1ZjFjNWYyMTA3ZWM0ZGU5NTk5NTM1ZGQ3ODA4OWYzMDQ2ZjgzMGZm
-    MTlmYWZmOGVkNDRkMGE5MDM4YzdiMmIxYTJmMjhjZGI4Y2JiMWM=
+    ZDNiZTAwMjA3NzU1MDQ1ODE4Y2VjYmYzMTQyYzUxMDk0NDE1OTU3Yzk4ODEx
+    ZjY1YTFiMGNmYjgxZGVlZGU5ZGJkOWZhYzExOTUwNTdkNWRkMzVjNDU4M2Q5
+    ZjQ3ZWFkNjRjMzE3NjdjMGI5ZTZhN2RmNjU0NjJlZWZjOGFmZGE=

data/VERSION

@@ -1 +1 @@
-2.0.6
+2.0.8

data/filbunke.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: filbunke 2.0.6 ruby lib
+# stub: filbunke 2.0.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "filbunke"
-  s.version = "2.0.6"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Wouter de Bie", "Bjorn Sperber", "Karl Ravn", "Magnus Spangdal"]
-  s.date = "2015-09-22"
+  s.date = "2015-10-09"
   s.description = "Filbunke client and library"
   s.email = "technical@deltaprojects.com"
   s.executables = ["filbunked"]

data/lib/filbunke/daemon.rb

@@ -27,7 +27,7 @@ module Filbunke
           failed_request_log_file_name = repository_config["failed_request_log_file_name"]||nil
           
           Client.new(repository, @logger, callbacks, failed_request_log_file_name)
-        rescue Exception => e
+        rescue => e
           msg = ["#{e.class} - #{e.message}", *e.backtrace].join("\n\t")
           STDERR.puts("Failed to initialize #{repository_name}; #{msg}")
           @logger.error("Failed to initialize #{repository_name}; #{msg}")
@@ -50,7 +50,7 @@ module Filbunke
               update_checkpoint_for_repository(client.repository, new_checkpoint)
               sleep client.repository.run_every
             end
-          rescue RuntimeError, SystemCallError, StandardError => e
+          rescue => e
             msg = ["#{e.class} - #{e.message}", *e.backtrace].join("\n\t")
             @logger.error("#{client.repository.name} Died..  #{msg}")
             Process.kill("KILL", @parent_pid)
@@ -86,10 +86,15 @@ module Filbunke
     end
 
     def write_pid!(pid_file_path)
-      existing_process = ::File.read(pid_file_path) rescue nil
-      unless existing_process.nil?
-        @logger.info("killing existing process #{existing_process} from #{pid_file_path}")
-        Process.kill("QUIT", existing_process.to_i) rescue nil
+      begin
+        existing_process = ::File.read(pid_file_path).to_i if ::File.readable?(pid_file_path)
+        if existing_process != nil and existing_process > 0
+          @logger.info("killing existing process #{existing_process} from #{pid_file_path}")
+          Process.kill("KILL", existing_process)
+          
+        end
+      rescue => e
+        @logger.warn("failed to kill existing pid from #{pid_file_path}: #{e}\n\twill ignore and continue...")
       end
       ::File.open(pid_file_path, 'w') do |f|
         f.write(Process.pid.to_i)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filbunke
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.8
 platform: ruby
 authors:
 - Wouter de Bie
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda