magent 0.0.1 → 0.0.2

data/examples/simple/bot.rb

@@ -3,13 +3,14 @@ require 'magent'
 
 # Use: magent /path/to/this/file
 
-Magent.push("/bot", :echo, "hello, world")
-Magent.push("/bot", :do_task, "File", :exist?, "/etc/passwd")
-Magent.push("/bot", :echo, "Press ctrl+c to close")
+Magent.push("/bots", :echo, "hello, world")
+Magent.push("/bots", :do_task, "File", :exist?, "/etc/passwd")
+Magent.push("/bots", :echo, "Press ctrl+c to close")
+Magent.push("/bots", :do_not_exist, "you should not see this message")
 
 class Bot
   include Magent::Actor
-
+  channel_name "bots"
   expose :echo, :do_task
 
   def echo(payload)
@@ -30,3 +31,4 @@ Magent.register(Bot.new)
 if $0 == __FILE__
   Magent::Processor.new(Magent.current_actor).run!
 end
+

data/lib/magent.rb

@@ -10,7 +10,7 @@ require 'magent/actor'
 require 'magent/processor'
 
 module Magent
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   def self.connection
     @@connection ||= Mongo::Connection.new

data/lib/magent/actor.rb

@@ -13,6 +13,10 @@ module Magent
         end
       end
 
+      def channel_name(name = nil)
+        @channel_name ||= (name || Magent::Utils.underscore(self.name))
+      end
+
       def actions
         @actions ||= Set.new
       end
@@ -24,7 +28,7 @@ module Magent
 
       def channel
         @channel ||= begin
-          channel_name = "/"+Magent::Utils.underscore(self.name)
+          channel_name = "/"+self.channel_name
           Channel.new(channel_name)
         end
       end

data/lib/magent/channel.rb

@@ -4,7 +4,7 @@ module Magent
       @name = name
 
       if !collection.find_one({:_id => @name}, {:fields => [:_id]})
-        collection.save({:_id => @name, :messages => []})
+        collection.save({:_id => @name, :messages => [], :errors => []})
       end
     end
 
@@ -12,15 +12,26 @@ module Magent
       collection.update({:_id => @name}, {:$push => {:messages => [message, args]}}, :repsert => true)
     end
 
+    def failed(info)
+      error_collection.save(info.merge({:channel_id => @name, :created_at => Time.now.utc}))
+    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"]})
+    end
+
     def dequeue
       Magent.database.eval(%@
         function dequeue() {
-          return db.eval(function() {
-            var q = db.channels.findOne({_id: '#{@name}'});
-            var m = q.messages.shift();
-            db.channels.save(q); //slow
-            return m;
-          });
+          var selector = {_id: '#{@name}'};
+          var q = db.channels.findOne(selector, {messages: 1 });
+          var m = q.messages[0];
+          if(m)
+            db.channels.update(selector, { $pop: { messages : -1 } })
+          return m;
         }
       @)
     end
@@ -29,6 +40,10 @@ module Magent
       self.class.collection
     end
 
+    def error_collection
+      @error_collection ||= Magent.database.collection("errors")
+    end
+
     def self.collection
       @collection ||= Magent.database.collection("channels")
     end

data/lib/magent/processor.rb

@@ -22,7 +22,17 @@ module Magent
         else
           delay = 0
           $stderr.puts "#{@actor.class}##{method}(#{payload.inspect})"
-          @actor.send(method, payload) # TODO: what if method is not defined?
+          begin
+            if @actor.class.actions.include?(method)
+              @actor.send(method, payload)
+            else
+              $stderr.puts "Unknown action: #{method} (payload=#{payload.inspect})"
+            end
+          rescue Exception => e
+            $stderr.puts "Error while executing #{method.inspect} #{payload.inspect}"
+            $stderr.puts "#{e.to_s} #{e.backtrace.join("\t\n")}"
+            @actor.class.channel.failed(:message => e.message, :method => method, :payload => payload, :backtrace => e.backtrace)
+          end
         end
 
         sleep delay

data/magent.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magent}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Cuadrado"]
-  s.date = %q{2009-10-03}
+  s.date = %q{2009-10-10}
   s.default_executable = %q{magent}
   s.description = %q{Simple job queue system based on mongodb}
   s.email = ["krawek@gmail.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: magent
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - David Cuadrado
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 -05:00
+date: 2009-10-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency