updater 0.9.3.2 → 0.9.4

data/VERSION

@@ -1 +1 @@
-0.9.3.2
+0.9.4

data/lib/updater/fork_worker.rb

@@ -73,6 +73,7 @@ module Updater
             stop(false)
             false
           when :USR2, :DATA #wake up a child and get to work
+            logger.info {"Master Process recieved job ready signal"}
             @pipe.last.write_nonblock('.')
             true
           when :TTIN
@@ -142,7 +143,7 @@ module Updater
           timeout = calc_timeout
           logger.debug { "Sleeping for #{timeout}" }
           ready, _1, _2 = IO.select(@wakeup_set, nil, nil, timeout)
-          return unless ready && ready.first #timeout hit,  just wakeup and run maintance
+          return unless ready && ready.first #timeout hit or self_pipe alerted,  just wakeup and run maintance
           add_connection(ready.first) and return if ready.first.respond_to?(:accept) #open a new incomming connection 
           @signal_queue << :DATA unless ready.first == @self_pipe.first
           loop {ready.first.read_nonblock(16 * 1024)}

data/lib/updater/orm/mongo.rb

@@ -32,7 +32,7 @@ module Updater
       end
       
       def _id=(val)
-        val = BSON::ObjectID.from_string(val.to_s) unless val.kind_of? BSON::ObjectID
+        val = BSON::ObjectId.from_string(val.to_s) unless val.kind_of? BSON::ObjectId
         @hash[:_id] = val
       end
       
@@ -59,7 +59,7 @@ module Updater
             job
           end
         end
-        _id = self.class.collection.save @hash
+        _id = self.class.collection.save(@hash, :safe=>true)
       end
       
       def destroy
@@ -106,10 +106,10 @@ module Updater
       
     private
       # this method is calld from he chain asignment methods eg. failure=(chain) 
-      # chain is an array which may contain BSON::ObjectID's or Updater::Update's or both
-      # For BSON::ObjectID's we cannot initialize them as this could leed to infinate loops.
+      # chain is an array which may contain BSON::ObjectId's or Updater::Update's or both
+      # For BSON::ObjectId's we cannot initialize them as this could leed to infinate loops.
       # (an object pool would solve this problem, but feels like overkill)
-      # The final result must be a @hash containing all the BSON::ObjectID' (forign keys)
+      # The final result must be a @hash containing all the BSON::ObjectId' (forign keys)
       # and possibly @failure containting all instanciated UpdaterUpdates read to be called
       # or @failure set to nil with the chain instanciated on first use.
       def build_chain_arrays(arr, build = false)
@@ -131,20 +131,20 @@ module Updater
         [nil,output[:ids]]
       end
       
-      # This method takes something that may be a reference to an instance(BSON::ObjectID/String),
+      # This method takes something that may be a reference to an instance(BSON::ObjectId/String),
       # an instance its self (Updater::Update), or a Hash 
-      # and returns a touple of the  Updater::Update,BSON::ObjectID.
-      # This method will bot instanciate object from BSON::ObjectID's
+      # and returns a touple of the  Updater::Update,BSON::ObjectId.
+      # This method will bot instanciate object from BSON::ObjectId's
       # nor will it save Hashes inorder to obtain an ID (it will creat a new Updater::Update from the hash).
       # Instead it will return nil in the appropriate place.
       def rationalize_instance(val)
-        val = BSON::ObjectID.fron_string(val) if val.kind_of? String
-        case val  #aval is the actual runable object, hval is a BSON::ObjectID that we can put into the Database
+        val = BSON::ObjectId.fron_string(val) if val.kind_of? String
+        case val  #aval is the actual runable object, hval is a BSON::ObjectId that we can put into the Database
           when Updater::Update
             val.params ? [val,[val.id,val.params]] : [val,val.id]
           when Hash
             [Updater::Update.new(val),val['_id']]
-          when BSON::ObjectID
+          when BSON::ObjectId
             [nil,val]
           when Array
             rationalize_instance(val[0]).tap do |ret| 
@@ -227,7 +227,7 @@ module Updater
         end 
         
         def get(id)
-          id = BSON::ObjectID.from_string(id) if id.kind_of? String
+          id = BSON::ObjectId.from_string(id) if id.kind_of? String
           new(@collection.find_one(id))
         end
         
@@ -249,6 +249,7 @@ module Updater
         
         def queue_time
           nxt = @collection.find_one({:lock_name=>nil, :time=>{'$ne'=>nil}}, :sort=>[[:time, :asc]], :fields=>[:time])
+          # logger.debug {"  the queue is empty"} unless nxt
           return nil unless nxt
           return 0 if nxt['time'] <= tnow
           return nxt['time'] - tnow
@@ -267,6 +268,14 @@ module Updater
           @collection.update({:lock_name=>worker.name},{'$unset'=>{:lock_name=>1}},:multi=>true)
         end
         
+        def for(target,finder,args,name)
+          if name
+            @collection.find(:target=>target.to_s, :finder_args=>args,:name=>name)
+          else
+            @collection.find(:target=>target.to_s, :finder_args=>args)
+          end
+        end
+        
         private
         def tnow
           Updater::Update.time.now.to_i

data/lib/updater/setup.rb

@@ -6,26 +6,33 @@ require 'erb'
 module Updater
   class Setup
     class << self
+      #start a new server
       def start(options={})
         new(config_file(options), options).start
       end
       
+      #stop the server
       def stop(options={})
         new(config_file(options), options).stop
       end
       
+      # Used for testing.  Will run through the entire setup process, but
+      # not actually start the server, but will log the resulting options.
       def noop(options={})
         new(config_file(options), options).noop
       end
       
+      # Connect a client to a server
       def client_setup(options = {})
         new(config_file(options), options).client_setup
       end
       
+      # pendeing
       def monitor
         
       end
-          
+      
+      # Retruns tha locaion of the config file. 
       def config_file(options = {})
         if options[:config_file] && File.exists?(options[:config_file])
           options[:config_file]
@@ -48,7 +55,7 @@ module Updater
       @logger = @options[:logger] || Logger.new(@options[:log_file] || STDOUT)
       level = Logger::SEV_LABEL.index(@options[:log_level].upcase) if @options[:log_level]
       @logger.level = level || Logger::WARN unless @options[:logger] #only set this if we were not handed a logger
-      @logger.debug "Debugging output enabled"
+      @logger.debug "Debugging output enabled" unless @options[:logger]
       Update.logger = @logger
     end
     
@@ -80,25 +87,45 @@ module Updater
       @logger.info "Updater Client is being initialized..."
       set_orm
       
-      if @options[:socket] && File.exists?(@options[:socket])
-        @logger.debug "Using UNIX Socket \"#{@options[:socket]}\""
-        Updater::Update.socket = UNIXSocket.new(@options[:socket])
-      elsif @options[:udp]
-        socket = UDPSocket.new()
-        socket.connect(@options[:host],@options[:udp])
-        Updater::Update.socket = socket
-      elsif @options[:tcp]
-        Updater::Update.socket = TCPSocket.new(@options[:host],@options[:tcp])
-      elsif @options[:remote]
-        raise NotImplimentedError #For future Authenticated Http Rest Server
-      end
+      Updater::Update.socket = socket_for_client
+      
+      
+      init_orm
       
       #set PID
       if File.exists? @options[:pid_file]
         Updater::Update.pid = File.read(@options[:pid_file]).strip
       end
       
-      
+      Updater::Update.config_file = @config_file
+      self
+    end
+    
+    def socket_for_client
+      if @options[:socket] && File.exists?(@options[:socket])
+        @logger.debug "Using UNIX Socket \"#{@options[:socket]}\""
+        return UNIXSocket.new(@options[:socket]) if File.exists?(@options[:socket]) && File.stat(@options[:socket]).socket?
+      end
+      if @options[:udp]
+        socket = UDPSocket.new()
+        socket.connect(@options[:host],@options[:udp])
+        begin
+          socket.write '.' #must test UDP sockets
+          return socket
+        rescue Errno::ECONNREFUSED
+        end
+      end
+      if @options[:tcp]
+        begin
+          return TCPSocket.new(@options[:host],@options[:tcp])
+        rescue Errno::ECONNREFUSED
+        end
+      end
+      if @options[:remote]
+        return nil
+        raise NotImplimentedError #For future Authenticated Http Rest Server
+      end
+      return nil
     end
     
     private

data/lib/updater/update.rb

@@ -212,6 +212,8 @@ module Updater
         if inst
           worker.logger.debug "  running job #{inst.id}" 
           new(inst).run
+        else
+          worker.logger.debug "  could not find a ready job in the datastore" 
         end
         @orm.queue_time
       ensure
@@ -405,6 +407,9 @@ module Updater
         @orm.clear_all
       end
       
+      # The name of the file to look for information if we loose the server  
+      attr_accessor :config_file
+      
       #Sets the process id of the worker process if known.  If this 
       #is set then an attempt will be made to signal the worker any
       #time a new update is made.
@@ -431,12 +436,46 @@ module Updater
       
     private
       def signal_worker
-        # TODO: If worker process goes down or has to be reset, try to reconnect
-        if @socket
-          @socket.write '.'
-        elsif @pid
-          Process::kill "USR2", @pid
+        errored = false
+        begin
+          if @socket
+            @socket.write '.'
+            logger.debug "Signaled Master Process Via Socket"
+          elsif @pid
+            Process::kill "USR2", @pid
+            logger.debug "Signaled Master Process Via PID"
+          else
+            signal_worker if connection_refresh
+          end
+        rescue SystemCallError
+          logger.warn "Lost Client Connection to Updater Server"
+          if connection_refresh && !errored
+            errored = true
+            retry
+          end
+        end
+      end
+      
+      def connection_refresh
+        logger.debug "Connection Refresh Attempted"
+        @socket.close if @socket
+        @socket = nil; @pid = nil #assume the old server died
+        @connection_refresh ||= [1,Time.now-1]
+        delay, time = @connection_refresh
+        if Time.now >= time+delay
+          Setup.new(@config_file, :logger=>logger).client_setup
+          if @pid || @socket #assume we were successful and retry
+            @connection_refresh = nil 
+            return true
+          else
+            logger.debug "Connection Refresh Failed"
+            #we are still not able to connect, don't try again for a while
+            @connection_refresh= [[delay*2,10*60].min,Time.now]
+            return false
+          end
         end
+        logger.debug "Connection Refresh Waiting until #{time+delay}"
+        return false
       end
       
       # Given some instance return the information needed to recreate that target 

data/lib/updater.rb

@@ -4,4 +4,5 @@ module Updater
   VERSION = File.read(File.join(File.dirname(__FILE__),'..','VERSION')).strip
 end
 
-require 'updater/update.rb'
+require 'updater/update.rb'
+require 'updater/setup.rb'

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require "dm-core"
 require 'dm-migrations'
 
 require 'updater'
-#require 'updater/thread_worker'
+require 'updater/thread_worker'
 require 'updater/fork_worker'
 require 'updater/orm/datamapper'
 

data/spec/update_spec.rb

@@ -13,7 +13,7 @@ describe Update do
 
 end
 
-context "Gemspec: " do
+describe "Gemspec: " do
   it"should match version" do
     gs = File.open(File.join(ROOT,'updater.gemspec')) do |f|
       eval f.read

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 3
-  - 2
-  version: 0.9.3.2
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - John F. Miller
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -07:00
+date: 2011-02-14 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency