magent 0.6.2 → 0.7.0

data/Gemfile

@@ -1,10 +1,11 @@
 source 'http://rubygems.org'
 
-gem 'mongo', '~> 1.0'
+gem 'mongo'
 gem 'uuidtools'
 
 gem 'em-websocket'
 
-gem 'sinatra', '~> 1.2.6'
-gem 'haml', '~> 3.1.1'
-gem 'launchy', '~> 0.4.0'
+gem 'sinatra'
+gem 'haml'
+gem 'launchy'
+

data/Gemfile.lock

@@ -1,34 +1,34 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.1)
-    bson (1.1)
-    configuration (1.2.0)
-    em-websocket (0.1.4)
+    addressable (2.2.7)
+    bson (1.6.2)
+    em-websocket (0.3.6)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
     eventmachine (0.12.10)
-    haml (3.1.1)
-    launchy (0.4.0)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    mongo (1.1)
-      bson (>= 1.0.5)
-    rack (1.3.0)
-    rake (0.9.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    tilt (1.3.2)
-    uuidtools (2.1.1)
+    haml (3.1.4)
+    launchy (2.1.0)
+      addressable (~> 2.2.6)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
+    uuidtools (2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   em-websocket
-  haml (~> 3.1.1)
-  launchy (~> 0.4.0)
-  mongo (~> 1.0)
-  sinatra (~> 1.2.6)
+  haml
+  launchy
+  mongo
+  sinatra
   uuidtools

data/Rakefile

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'rake'
 
+$:.unshift File.expand_path("../lib", __FILE__)
+require 'magent'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -40,11 +43,9 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.7.0

data/bin/magent

@@ -98,9 +98,7 @@ class Controller
   def stop
     begin
       pid = File.read(pid_file).to_i
-      Process.kill("TERM", pid)
-      Process.kill(0, pid)
-      Process.wait
+      Process.kill("QUIT", pid)
     rescue Errno::ECHILD, Errno::ESRCH => e
       $stdout.puts "Process #{pid} has stopped"
     rescue Errno::ENOENT => e

data/examples/findable.rb

@@ -0,0 +1,36 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+require 'magent'
+
+class Findable
+  attr_accessor :id
+  def initialize(id)
+    @id = id
+  end
+
+  def self.find(id)
+    Findable.new(id)
+  end
+
+  def inspect
+    "Findable<#{@id}>"
+  end
+end
+
+class Manager
+  include Magent::Async
+
+  def self.process(findable)
+    puts ">>> Proccessing: #{findable.inspect}"
+  end
+end
+
+findable = Findable.new(19)
+Manager.async(:queue1).process(findable)
+
+
+# open the queue1 and process the messages
+channel = Magent::AsyncChannel.new(:queue1)
+processor = Magent::Processor.new(channel)
+
+processor.run!(false)

data/examples/retries.rb

@@ -0,0 +1,25 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+require 'magent'
+
+class Worker
+  include Magent::Async
+
+  def self.work()
+    if rand < 0.95
+      puts "failed!"
+      raise "try again"
+    else
+      puts "OK!"
+    end
+  end
+end
+Worker.async(:queue1).work
+
+
+# open the queue1 and process the messages
+channel = Magent::AsyncChannel.new(:queue1)
+processor = Magent::Processor.new(channel)
+
+processor.run!(true)
+

data/examples/test_mode.rb

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+require 'magent'
+
+class MyClass
+  include Magent::Async
+
+  def foo
+    puts "bar"
+  end
+end
+
+Magent.sync_mode = true
+
+c = MyClass.new
+c.async.foo
+
+

data/lib/magent.rb

@@ -11,18 +11,16 @@ require 'magent/failure'
 
 require 'magent/utils'
 require 'magent/generic_channel'
-require 'magent/actor_channel'
-require 'magent/push'
-require 'magent/actor'
+
 require 'magent/processor'
 
 require 'magent/async'
 require 'magent/async_channel'
 
-require 'magent/railtie' if defined?(Rails) && Rails.version >= "3.0.0"
-
-if defined?(EventMachine::WebSocket)
-  require 'magent/web_socket_server'
+if defined?(Rails) && Rails.version >= "3.0.0"
+  require 'magent/railtie'
+elsif defined?(Rake)
+  require 'magent/tasks'
 end
 
 module Magent
@@ -62,6 +60,14 @@ module Magent
     @@config = config
   end
 
+  def self.sync_mode
+    @@sync_mode ||= false
+  end
+
+  def self.sync_mode=(m)
+    @@sync_mode = m
+  end
+
   def self.connect(environment, options={})
     raise 'Set config before connecting. Magent.config = {...}' if config.nil? || config.empty?
 

data/lib/magent/async.rb

@@ -9,9 +9,9 @@
 #     end
 #
 #     async call:
-#         Processor.find(id).async(:my_queue).process.commit!(priority)
+#         Processor.find(id).async(:my_queue, priority).process
 #     chained methods:
-#         Processor.async(:my_queue, true).find(1).process.commit!(priority)
+#         Processor.async(:my_queue, priority).find(1).process
 #
 
 module Magent
@@ -26,39 +26,36 @@ module Magent
     class Proxy
       instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|proxy_|^object_id$)/ }
 
-      def initialize(queue, target, test = false)
+      def initialize(queue, target, priority = 3)
         @queue = queue
-        @method_chain = []
         @target = target
-        @test = test
+        @priority = priority
 
         @channel = Magent::AsyncChannel.new(@queue)
       end
 
-      def commit!(priority = 3)
-        @channel.push(@target, @method_chain, priority)
-
-        if @test
-          target = @target
-          @method_chain.each do |c|
-            target = target.send(c[0], *c[1])
-          end
-
-          target
+      def commit!(method_name, args)
+        if Magent.sync_mode
+          @target.send(method_name, *args)
+        else
+          @channel.push(@target, [method_name, args], @priority)
         end
+
+        @target
       end
 
       def method_missing(m, *args, &blk)
         raise ArgumentError, "ruby blocks are not supported yet" if !blk.nil?
-        @method_chain << [m, args]
+
+        commit!(m, args)
         self
       end
     end
 
     module Methods
-      # @question.async(:judge).on_view_question.commit!(1)
-      def async(queue = :default, test = false)
-        Magent::Async::Proxy.new(queue, self, test)
+      # @question.async(:judge).on_view_question
+      def async(queue = :default, priority = 3)
+        Magent::Async::Proxy.new(queue, self, priority)
       end
     end
   end # Async

data/lib/magent/async_channel.rb

@@ -1,38 +1,30 @@
 module Magent
   class AsyncChannel < GenericChannel
-    def push(target, method_chain, priority)
+    def push(target, method, priority)
+      encode_args(method[1])
+
       if target.kind_of?(Class)
-        enqueue([target.to_s, nil, method_chain], priority)
+        enqueue([target.to_s, nil, method], priority)
       elsif target.class.respond_to?(:find) && target.respond_to?(:id)
-        enqueue([target.class.to_s, target.id, method_chain], priority)
+        enqueue([target.class.to_s, target.id, method], priority)
       else
         raise ArgumentError, "I don't know how to handle #{target.inspect}"
       end
     end
 
     def process!(message)
-      klass, id, method_chain = message
+      klass, id, method = message
 
-      return false if method_chain.nil?
+      return false if method.nil?
 
-      target = resolve_target(klass, id)
+      target = async_find(klass, id)
+      args = resolve_args(method[1])
 
-      method_chain.each do |c|
-        target = target.send(c[0], *c[1])
-      end
+      target = target.send(method[0], *args)
 
       true
     end
 
     private
-    def resolve_target(klass, id)
-      klass = Object.module_eval(klass) if klass.kind_of?(String)
-
-      if id
-        klass.find(id)
-      else
-        klass
-      end
-    end
   end # AsyncChannel
 end

data/lib/magent/failure.rb

@@ -1,7 +1,12 @@
 module Magent
   module Failure
     def failed(info)
-      error_collection.save(info.merge({:_id => generate_uid, :channel => @name, :channel_class => self.class.to_s, :created_at => Time.now.utc}))
+      error_collection.save(info.merge({
+        :_id => generate_uid,
+        :channel => @name,
+        :channel_class => self.class.to_s,
+        :created_at => Time.now.utc
+      }))
     end
 
     def error_count
@@ -22,8 +27,12 @@ module Magent
     end
 
     def retry_error(error)
-      process!(error["message"])
-      remove_error(error["_id"])
+      begin
+        process!(error["message"])
+        remove_error(error["_id"])
+      rescue => e
+        $stderr.puts "Failed to retry error #{error['_id']}: #{e.message}"
+      end
     end
 
     def enqueue_error(error)

data/lib/magent/generic_channel.rb

@@ -11,7 +11,7 @@ module Magent
     end
 
     def enqueue(message, priority = 3)
-      collection.save({:_id => generate_uid, :message => message, :priority => priority, :created_at => Time.now.to_i})
+      collection.save({:_id => generate_uid, :message => message, :priority => priority, :created_at => Time.now.to_i, :retries => 0})
     end
 
     def message_count
@@ -37,9 +37,54 @@ module Magent
       @collection ||= Magent.database.collection(@name)
     end
 
+    def retry_current_job
+      return false if !@current_job
+
+      @current_job['retries'] ||= 0
+      if @current_job['retries'] < 20
+        @current_job['retries'] += 1
+        collection.save(@current_job)
+        true
+      else
+        false
+      end
+    end
+
     protected
     def generate_uid
       UUIDTools::UUID.random_create.hexdigest
     end
+
+    def async_find(klass, id)
+      klass = Object.module_eval(klass) if klass.kind_of?(String)
+
+      if id
+        klass.find(id)
+      else
+        klass
+      end
+    end
+
+    def encode_args(args)
+      args.map! do |arg|
+        if arg.class.respond_to?(:find) && arg.respond_to?(:id)
+          {'async_find' => [arg.class.to_s, arg.id]}
+        elsif arg.kind_of?(Class)
+          {'async_find' => [arg.to_s, nil]}
+        else
+          arg
+        end
+      end
+    end
+
+    def resolve_args(args)
+      args.map do |arg|
+        if arg.kind_of?(Hash) && arg.include?('async_find')
+          async_find(*arg['async_find'])
+        else
+          arg
+        end
+      end
+    end
   end # GenericChannel
 end

data/lib/magent/processor.rb

@@ -6,15 +6,9 @@ module Magent
       @identity = identity
 
       @channel.on_start(identity)
-
-#       @actor.class.actions.each do |action|
-#         if !@actor.respond_to?(action)
-#           raise ArgumentError, "action '#{action}' is not defined"
-#         end
-#       end
     end
 
-    def run!
+    def run!(service = true)
       processed_messages = 0
       delay = 0
 
@@ -43,19 +37,25 @@ module Magent
           end
         rescue SystemExit
         rescue Exception => e
-          $stderr.puts "Error processing #{message.inspect} => #{e.message}"
+          $stderr.puts "Error processing #{message.inspect} => #{e.message}.\n#{e.backtrace.join("\n\t")}"
           @channel.on_job_failed(@identity)
-          @channel.failed(:error => e.message, :message => message, :backtrace => e.backtrace, :date => Time.now.utc)
+
+          if !@channel.retry_current_job
+            $stderr.puts "Cannot retry job because it has been retried #{@channel.current_job['retries']} times"
+            @channel.failed(:error => e.message, :message => message, :backtrace => e.backtrace, :date => Time.now.utc)
+          end
         ensure
         end
 
+        break if !service
+
         sleep (delay*100.0).to_i/100.0
       end
     end
 
     def shutdown!
       @shutdown = true
-      @channel.on_quit
+      @channel.on_quit(@identity)
 
       @channel.on_shutdown if @channel.respond_to?(:on_shutdown)
       $stderr.puts "Shutting down..."