filbunke 1.11.6 → 1.11.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2NkMTBmMzNhMTkwZjg1OWJjN2NkMzQyZWNjY2U2ZmVhMTU5YTY0Nw==
+    NmJjMzZlZDNmNTlhNWU1YzFkMDRlMzVlMjQwYTZhNjYzODcxZGFlYQ==
   data.tar.gz: !binary |-
-    NzZkODc3ZTAxYWQxOTY4YjczOTdlZTM4ZTAzOTljY2YwZmQ0NWYzZA==
+    ZGZkZWFkMjg0OTExZjg3NDRjNzRmMzgzYWE2OTVhMmI4ODBlYWI0OA==
 SHA512:
   metadata.gz: !binary |-
-    YWE5YTVhMzE0MTEzODU3OTZkMjdlZDgyODVjZTJhYmViNTY2OWUyYTJjM2E2
-    MTdmM2Y4YjY4OTM4MjNjZDE0YTVkMGVkOWI5ODM2NTcwYzczZDBlMzBmOWY0
-    Njg4NzRiODAxYWNmNzM2OTU0MmZiZmYwMDM4MGY0ZDExMzc4OWE=
+    ZjE3MGE1M2FjMzhiMTcyNTMyNGExNGM5YTQzOTY5MzM3NWVkZTJiMTk0ZWUx
+    NjQzMjVmMTY4NjRiY2NiMTA4YzlkMGUwZGYyNGYwMzFkZGRiNDU3ZDQwNDY1
+    MWVlMjMyMDAyYTFhNjA5ODIzNWQyOTUwNjMwNzlhODgzNTc0Nzg=
   data.tar.gz: !binary |-
-    YjA4NjZjZTcxMzVjZjkwY2MzNmI4MzQ0MDdlOWVkYmFkMmU3NjdmOGM1NjFm
-    NDA2MzlhMThhMDgxZjQwYWEwNDI2ZDM5MjZhMjg3MDFkMjFkODBhMWQ3NjY0
-    MWViMTgwN2NkYmQ1NDg1MDNjN2Q0NDdiZmJkOTc4YmEzZmU1ZDk=
+    NGQ4MTNmZDY4Y2I3ZGZhMjkyODRjNjIyZTFjN2U3OGZjMGQyYmM2MzhjOWQw
+    NGNlOGU4YzIzOTE4NDQxNWFhMzEyYzZjZjJjYzZiZWUzODdlY2NiN2IyYmIz
+    NzM3YWZkMTBlMzNkODJjMjAyYjBjNTcxMjY4OTE5MjRlYjA2YTY=

data/VERSION

@@ -1 +1 @@
-1.11.6
+1.11.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 1.11.6 ruby lib
+# stub: filbunke 1.11.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "filbunke"
-  s.version = "1.11.6"
+  s.version = "1.11.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

@@ -25,7 +25,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")
           @logger.error("Failed to initialize #{repository_name}; #{msg}")
           raise e
@@ -47,7 +47,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)
@@ -82,13 +82,18 @@ module Filbunke
     end
 
     def write_pid!(pid_file_path)
-      
-      existing_process = ::File.read(pid_file_path)
-      unless existing_process.nil?
-        @logger.info("killing existing process #{existing_process} from #{pid_file_path}")
-        Process.kill("KILL", 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)
         f.close

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filbunke
 version: !ruby/object:Gem::Version
-  version: 1.11.6
+  version: 1.11.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