filbunke 1.8.1 → 1.8.2

data/VERSION

@@ -1 +1 @@
-1.8.1
+1.8.2

data/filbunke.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{filbunke}
-  s.version = "1.8.1"
+  s.version = "1.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wouter de Bie", "Bj\303\266rn Sperber"]
-  s.date = %q{2012-09-04}
+  s.date = %q{2012-09-07}
   s.default_executable = %q{filbunked}
   s.description = %q{Filbunke client and library}
   s.email = %q{wouter@deltaprojects.se}

data/lib/filbunke/client.rb

@@ -1,7 +1,7 @@
 module Filbunke
   class Client
 
-    attr_reader :repository
+    attr_reader :repository, :run_every
 
     UPDATES_ACTION = 'updates'
     FILES_ACTION = 'files'
@@ -12,9 +12,10 @@ module Filbunke
     HASH_KEY = 'hash'
 
 
-    def initialize(repository, logger, callbacks = [], failed_request_log_file_name = nil)
+    def initialize(repository, logger, run_every, callbacks = [], failed_request_log_file_name = nil)
       @repository = repository
       @logger = logger
+      @run_every = run_every
       @callbacks = callbacks
       @failed_request_log_file_name = failed_request_log_file_name
     end

data/lib/filbunke/daemon.rb

@@ -11,6 +11,42 @@ module Filbunke
     def setup_clients!(local = false)
       @logger = Logger.new(@config["log_file"], local)
       @logger.log("Initializing filbunked")
+
+      if(@config["version"] && @config["version"].to_i == 2)
+        version_2_configure
+      else
+        version_1_configure
+      end
+    end
+
+    def version_2_configure
+      @config["repositories"].each do |repository_name, local_repository_config|
+        @logger.log("Initializing repository (version 2): #{repository_name}")
+        repository_file = File.read("#{repository_name}.yml")
+        static_repository_config = YAML.load("#{@config["repository_files_path"]}#{repository_file}")
+        @clients << begin
+          repository = Repository.new(static_repository_config["filbunke_server_repository"],
+                                      static_repository_config["filbunke_server_host"],
+                                      static_repository_config["filbunke_server_port"],
+                                      local_repository_config["local_path"],
+                                      @config["file_umask"].to_i,
+                                      @config["directory_umask"].to_i,
+                                      static_repository_config["file_url_username"],
+                                      static_repository_config["file_url_password"],
+                                      @config["hadoop_binary"])
+          callbacks = []
+          local_repository_config["callbacks"].each do |callback_name, callback_config|
+            require ::File.join(@config["callback_path"], callback_name.to_s)
+            callback_class =  Module.const_get(callback_name.split("_").map(&:capitalize).join)
+            callbacks << callback_class.new(@logger, callback_config)
+          end if local_repository_config["callbacks"]
+          run_every = local_repository_config["run_every"] ? local_repository_config["run_every"].to_i : @config["run_every"].to_i
+          Client.new(repository, @logger, run_every, callbacks)
+        end
+      end
+    end
+
+    def version_1_configure
       @config["repositories"].each do |repository_name, repository_config|
         @logger.log("Initializing repository: #{repository_name}")
         @clients << begin
@@ -29,26 +65,32 @@ module Filbunke
             callback_class =  Module.const_get(callback_name.split("_").map(&:capitalize).join)
             callbacks << callback_class.new(@logger, callback_config)
           end
-          Client.new(repository, @logger, callbacks)
+          Client.new(repository, @logger, @config["run_every"].to_i, callbacks)
         end
       end
     end
 
+
+
     def run!
       version = ::File.read(::File.expand_path(::File.join(::File.dirname(__FILE__), "../../VERSION"))).chomp
       @logger.log("Starting filbunked version #{version}")
+      counter = 0
       while true
+        counter++
         begin
           @clients.each do |client|
-            new_checkpoint = client.update_files!(checkpoint_for_repository(client.repository))
-            update_checkpoint_for_repository(client.repository, new_checkpoint)
+            if(counter % client.run_every == 0)
+              new_checkpoint = client.update_files!(checkpoint_for_repository(client.repository))
+              update_checkpoint_for_repository(client.repository, new_checkpoint)
+            end
           end
         rescue StandardError => e
           @logger.log("Died.. #{e.message}")
           @logger.log(e.backtrace.join("\n"))
           exit 1
         end
-        sleep @config["run_every"]
+        sleep 1
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 1
-  version: 1.8.1
+  - 2
+  version: 1.8.2
 platform: ruby
 authors: 
 - Wouter de Bie
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-04 00:00:00 +02:00
+date: 2012-09-07 00:00:00 +02:00
 default_executable: filbunked
 dependencies: 
 - !ruby/object:Gem::Dependency