magent 0.1.2 → 0.1.3

data/Manifest.txt

@@ -6,7 +6,9 @@ Rakefile
 bin/magent
 examples/comm/run.rb
 examples/comm/worker.rb
+examples/error/error.rb
 examples/simple/bot.rb
+examples/stats/stats.rb
 lib/magent.rb
 lib/magent/actor.rb
 lib/magent/channel.rb

data/README.rdoc

@@ -8,13 +8,18 @@ Simple job queue system based on mongodb
 
 == FEATURES/PROBLEMS:
 
+* fast (enough?)
+* simple
+* scalable
+
 == SYNOPSIS:
 
 see examples/
 
 == REQUIREMENTS:
 
-* mongodb-ruby-driver
+* mongodb >= 1.0
+* mongo   >= 0.15.1 (gem install mongo -s http://gemcutter.org )
 
 == INSTALL:
 

data/Rakefile

@@ -14,7 +14,7 @@ $hoe = Hoe.spec 'magent' do
   self.developer 'David Cuadrado', 'krawek@gmail.com'
   self.post_install_message = 'PostInstall.txt'
   self.rubyforge_name       = self.name
-  self.extra_deps         = [['mongo','>= 0.15.1']]
+  self.extra_deps         = [['mongo','>= 0.16']]
 
 end
 

data/examples/error/error.rb

@@ -0,0 +1,33 @@
+$:.unshift File.dirname(__FILE__)+"/../../lib/"
+require 'magent'
+
+Magent.push("/errors", :fail, "this is a fail")
+
+class Error
+  include Magent::Actor
+
+  channel_name "errors"
+  expose :fail
+
+  def fail(payload)
+    @count ||= 0
+    errors = self.class.channel.errors
+
+    errors.each do |error|
+      @count += 1
+      $stderr.puts "Retrying: #{error["method"]}(#{error["payload"].inspect})"
+      self.class.channel.retry_error(error)
+    end
+
+    if @count == 0
+      raise payload.inspect
+    end
+  end
+end
+
+Magent.register(Error.new)
+
+if $0 == __FILE__
+  Magent::Processor.new(Magent.current_actor).run!
+end
+

data/examples/stats/stats.rb

@@ -0,0 +1,27 @@
+$:.unshift File.dirname(__FILE__)+"/../../lib/"
+require 'magent'
+
+Magent.push("/stats", :calc)
+Magent.push("/stats", :calc)
+Magent.push("/stats", :calc)
+Magent.push("/stats", :calc)
+
+class Stats
+  include Magent::Actor
+
+  channel_name "stats"
+  expose :calc
+
+  def calc(payload)
+    $stderr.puts "messages in queue: #{self.class.channel.queue_count}"
+    $stderr.puts "total messages count: #{self.class.channel.message_count}"
+    $stderr.puts "total errors: #{self.class.channel.error_count}"
+  end
+end
+
+Magent.register(Stats.new)
+
+if $0 == __FILE__
+  Magent::Processor.new(Magent.current_actor).run!
+end
+

data/lib/magent.rb

@@ -11,7 +11,7 @@ require 'magent/actor'
 require 'magent/processor'
 
 module Magent
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   def self.connection
     @@connection ||= Mongo::Connection.new(nil, nil, :auto_reconnect => true)

data/lib/magent/actor.rb

@@ -55,7 +55,12 @@ module Magent
 
           if delta >= task[:every]
             task[:last_time] = Time.now
-            instance_eval(&task[:block])
+            begin
+              instance_eval(&task[:block])
+            rescue Exception => e
+              $stderr.puts "Failed periodical task: #{e.message}"
+              $stderr.puts e.backtrace.join("\n\t")
+            end
             performed = true
           end
         end

data/lib/magent/channel.rb

@@ -8,11 +8,29 @@ module Magent
       error_collection.save(info.merge({:channel_id => @name, :created_at => Time.now.utc}))
     end
 
+    def error_count
+      error_collection.find({:channel_id => @name}).count()
+    end
+
     def errors(conds = {})
       page = conds.delete(:page) || 1
       per_page = conds.delete(:per_page) || 10
 
-      error_collection.find({:channel_id => @name}, {:offset => (page-1)*per_page, :limit => per_page, :sort => ["created_at"]})
+      error_collection.find({:channel_id => @name}, {:skip => (page-1)*per_page, :limit => per_page, :sort => [["created_at", "descending"]]})
+    end
+
+    def remove_error(error_id)
+      object_id = error_id
+      if error_id.kind_of?(String)
+        object_id = Mongo::ObjectID.from_string(error_id)
+      end
+
+      self.error_collection.remove(:_id => object_id, :channel_id => @name)
+    end
+
+    def retry_error(error)
+      remove_error(error["_id"])
+      enqueue(error["method"], error["payload"])
     end
 
     def error_collection

data/lib/magent/generic_channel.rb

@@ -9,7 +9,26 @@ module Magent
     end
 
     def enqueue(message)
-      collection.update({:_id => @name}, {:$push => {:messages => message}}, :repsert => true)
+      collection.update({:_id => @name}, {:$push => {:messages => message}, :$inc => {:message_count => 1}}, :repsert => true)
+    end
+
+    def message_count
+      channel = collection.find({:_id => @name}, :fields => [:message_count]).next_object
+      if channel
+        channel["message_count"] || 0
+      else
+        0
+      end
+    end
+
+    def queue_count
+      Magent.database.eval(%@
+        function queue_count() {
+          var selector = {_id: '#{@name}'};
+          var q = db.channels.findOne(selector, {messages: 1 });
+          return q.messages.length;
+        }
+      @)
     end
 
     def dequeue

data/magent.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magent}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Cuadrado"]
-  s.date = %q{2009-10-14}
+  s.date = %q{2009-11-08}
   s.default_executable = %q{magent}
   s.description = %q{Simple job queue system based on mongodb}
   s.email = ["krawek@gmail.com"]
   s.executables = ["magent"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/magent", "examples/comm/run.rb", "examples/comm/worker.rb", "examples/simple/bot.rb", "lib/magent.rb", "lib/magent/actor.rb", "lib/magent/channel.rb", "lib/magent/generic_channel.rb", "lib/magent/processor.rb", "lib/magent/push.rb", "lib/magent/utils.rb", "magent.gemspec", "script/console", "test/test_helper.rb", "test/test_magent.rb"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/magent", "examples/comm/run.rb", "examples/comm/worker.rb", "examples/error/error.rb", "examples/simple/bot.rb", "examples/stats/stats.rb", "lib/magent.rb", "lib/magent/actor.rb", "lib/magent/channel.rb", "lib/magent/generic_channel.rb", "lib/magent/processor.rb", "lib/magent/push.rb", "lib/magent/utils.rb", "magent.gemspec", "script/console", "test/test_helper.rb", "test/test_magent.rb"]
   s.homepage = %q{http://github.com/dcu/magent}
   s.post_install_message = %q{PostInstall.txt}
   s.rdoc_options = ["--main", "README.rdoc"]
@@ -27,14 +27,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo>, [">= 0.15.1"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0.16"])
       s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
     else
-      s.add_dependency(%q<mongo>, [">= 0.15.1"])
+      s.add_dependency(%q<mongo>, [">= 0.16"])
       s.add_dependency(%q<hoe>, [">= 2.3.3"])
     end
   else
-    s.add_dependency(%q<mongo>, [">= 0.15.1"])
+    s.add_dependency(%q<mongo>, [">= 0.16"])
     s.add_dependency(%q<hoe>, [">= 2.3.3"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: magent
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - David Cuadrado
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-14 00:00:00 -05:00
+date: 2009-11-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.15.1
+        version: "0.16"
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -52,7 +52,9 @@ files:
 - bin/magent
 - examples/comm/run.rb
 - examples/comm/worker.rb
+- examples/error/error.rb
 - examples/simple/bot.rb
+- examples/stats/stats.rb
 - lib/magent.rb
 - lib/magent/actor.rb
 - lib/magent/channel.rb