senotrusov-ruby-daemonic-threads 1.0.7 → 1.0.9

data/lib/ruby-daemonic-threads/config.rb

@@ -20,28 +20,42 @@ class DaemonicThreads::Config
       config["environment"] && !(config["environment"].split(/ *, */).include?(Rails.env))
     end
     
-    @queue_names = get_queue_names
+    @queues = @daemons.delete("queues") || {}
+    
+    daemons_use_queues.each do |name|
+      @queues[name] ||= {}
+    end
+    
+    @queues.each do |name, config|
+      config = @queues[name] = {} unless config
+
+      if config["class"].nil? || config["class"].empty?
+        config["class-constantized"] = PersistentQueue
+      else
+        config["class-constantized"] = config["class"].constantize
+      end
+    end
     
     @daemons.each do |name, config|
       raise "Class name for daemon `#{name}' must be specified" if config["class"].nil? || config["class"].empty?
        
       config["class-constantized"] = config["class"].constantize
-    end    
+    end
     
     Rails.logger.debug {"#{self.class}#initialize -- Configuration: #{self.inspect}"}
   end
   
-  attr_reader :queue_names, :daemons
+  attr_reader :queues, :daemons
   
   private
   
-  def get_queue_names
+  def daemons_use_queues
     names = []
     
     @daemons.collect do |name, config|
       if config["queues"] 
         config["queues"].each do |queue_daemon_handler, queue_name|
-          names.push queue_name.to_sym
+          names.push queue_name
         end
       end 
     end

data/lib/ruby-daemonic-threads/process.rb

@@ -29,8 +29,6 @@ class DaemonicThreads::Process
   attr_reader :controller, :name, :config, :http, :queues, :daemons
   
   def start
-    @queues.restore
-    
     @http.start
     @daemons.start
   end
@@ -46,7 +44,7 @@ class DaemonicThreads::Process
   end
 
   def before_exit
-    @queues.store
+    @queues.store_and_close
   end
 
 end

data/lib/ruby-daemonic-threads/queues.rb

@@ -21,53 +21,40 @@
 #   On the other hand, queues tends to be quite quickly  
 
 class DaemonicThreads::Queues
-
   DEFAULT_STORAGE_DIR = Rails.root + 'tmp' + 'queues'
 
   def initialize(process)
     @queues = {}
+    @config = process.config.queues
+
     @storage_dir = DEFAULT_STORAGE_DIR
-    @queue_names = process.config.queue_names 
+    @storage_dir.mkpath
     
-    raise("Queues storage directory #{@storage_dir} is not available!") unless storage_available?
-  end
-  
-  def restore
-    @queue_names.each do |name|
-      if File.exists?(filename = "#{@storage_dir}/#{name}")
-        @queues[name] = SmartQueue.new(File.read(filename))
-        File.unlink(filename)
-      else
-        @queues[name] = SmartQueue.new
+    @config.each do |name, config|
+    
+      queue = @queues[name.to_sym] = config["class-constantized"].new
+      
+      if queue.respond_to?(:restore)
+        queue.storage = @storage_dir + name
+        queue.restore
+      end
+
+      if queue.respond_to?(:config=)
+        queue.config = config
       end
-      @queues[name].persistent = true
+      
     end
+    
   end
   
-  def store
+  def store_and_close
     @queues.each do |name, queue|
-      File.write("#{@storage_dir}/#{name}", queue.to_storage) if queue.persistent
+      queue.store_and_close if queue.respond_to?(:store_and_close)
     end
   end
 
   def [] name
     @queues[name]
   end
-  
-  private
-
-  def storage_available?
-    if File.directory?(@storage_dir) && File.writable?(@storage_dir)
-      return true
-    else
-      begin
-        Dir.mkdir(@storage_dir)
-        return true
-      rescue SystemCallError
-        return false
-      end
-    end
-  end
-  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: senotrusov-ruby-daemonic-threads
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors: 
 - Stanislav Senotrusov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-06 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency