cirrocumulus 0.9.7 → 0.9.8

data/lib/cirrocumulus/channels.rb

@@ -1,3 +1,4 @@
+require 'log4r'
 require_relative 'channels/jabber'
 
 #
@@ -150,7 +151,7 @@ class ChannelFactory
       if ontology_instance
         return ThreadChannel.new(Ontology.query_ontology_instance(agent))
       else
-        puts "[WARN] Thread-local ontology not found for identifier=%s" % agent.to_s
+        Logger['channels::factory'].warn "Thread-local ontology not found for identifier=%s" % agent.to_s
       end
     elsif agent.is_a?(RemoteIdentifier)
       jabber_client = JabberChannel.query_client(instance.to_s)
@@ -158,11 +159,11 @@ class ChannelFactory
       if jabber_client
         return NetworkChannel.new(jabber_client, agent.to_s)
       else
-        puts "[WARN] No active Jabber clients."
+        Logger['channels::factory'].warn "No active Jabber clients."
       end
     end
 
-    puts "[WARN] No suitable channel found for #{agent.to_s} (#{agent.class.name})"
+    Logger['channels::factory'].warn "No suitable channel found for #{agent.to_s} (#{agent.class.name})"
     nil
   end
 end

data/lib/cirrocumulus/channels/jabber.rb

@@ -7,7 +7,7 @@ class JabberIdentifier < RemoteIdentifier
   def initialize(jid)
     @jid = "#{Cirrocumulus::Environment.current.name}-#{jid}"
     @channel = JabberChannel.new()
-    @channel.connect(@jid, 'q1w2e3r4')
+    @channel.connect(@jid)
     @thrd = Thread.new do
       parser = Sexpistol.new
       while true do
@@ -66,8 +66,10 @@ class JabberIdentifier < RemoteIdentifier
                   instance.handle_failure(id, action_content[0], action_content[1], options)
               end
             rescue Exception => ex
-              puts ex.message
-              puts ex.backtrace.to_s
+              Log4r::Logger['channels'].warn("Failed to process incoming message")
+              Log4r::Logger['channels'].debug("Message body: #{msg.body}")
+              Log4r::Logger['channels'].debug("Exception: #{ex.message}")
+              Log4r::Logger['channels'].debug("Backtrace: #{ex.backtrace.join("\n")}")
             end
           end
         end
@@ -97,12 +99,12 @@ class JabberChannel
       @@server = server
     end
 
-    def conference(conf)
-      @@conference = conf
+    def password(pass)
+      @@password = pass
     end
 
-    def jid_suffix(suffix)
-      @@jid_suffix = suffix
+    def conference(conf)
+      @@conference = conf
     end
   end
 
@@ -123,24 +125,26 @@ class JabberChannel
     @jabber && @jabber.connected?
   end
   
-  def connect(jid, password)
-    @full_jid = "%s@%s" % [jid, @@jid_suffix || @server]
+  def connect(jid)
+    @full_jid = "%s@%s" % [jid, @server]
     @jid = jid
 
-    puts "Using jid #{@jid}"
+    Log4r::Logger['channels::jabber'].info "Server: #{@server}"
+    Log4r::Logger['channels::jabber'].info "JID: '#{@jid}'"
     
     begin
-      @jabber = Jabber::Simple.new(@full_jid, password)
+      @jabber = Jabber::Simple.new(@full_jid, @@password)
     rescue Jabber::ClientAuthenticationFailure => ex
-      puts ex.class.name
-      puts ex.to_s
+      Log4r::Logger['channels::jabber'].debug('Received Jabber::ClientAuthenticationFailure, registering new account')
       client = Jabber::Client.new(@full_jid)
       client.connect()
       client.register(password)
       client.close()
-      @jabber = Jabber::Simple.new(@full_jid, password)
+      @jabber = Jabber::Simple.new(@full_jid, @@password)
     rescue Exception => ex
-      puts ex.to_s
+      Log4::Logger['channels::jabber'].fatal('Failed to register new account or connect.')
+      Log4::Logger['channels::jabber'].fatal("Received exception: #{ex.to_s}")
+      return false
     end
     
     join_conference(@conference) if connected?
@@ -182,6 +186,7 @@ class JabberChannel
   protected
   
   def join_conference(conference)
-    @jabber.send!("<presence to='#{conference}@conference.#{@@jid_suffix || @server}/#{@jid}' />")
+    Log4r::Logger['channels::jabber'].info "Joining conference '#{conference}'"
+    @jabber.send!("<presence to='#{conference}@conference.#{@server}/#{@jid}' />")
   end
 end

data/lib/cirrocumulus/environment.rb

@@ -1,3 +1,5 @@
+require 'log4r'
+
 module Cirrocumulus
   #
   # Cirrocumulus environment. It is a container where all ontologies will be loaded.
@@ -11,7 +13,7 @@ module Cirrocumulus
     attr_reader :name
 
     def initialize(name)
-      puts "Loading #{name} Cirrocumulus environment."
+      Log4r::Logger['agent'].info "Loading #{name} Cirrocumulus environment"
 
       @name = name
       @ontologies = []
@@ -22,7 +24,7 @@ module Cirrocumulus
     # Loads ontology instance into environment.
     #
     def load_ontology(ontology_instance)
-      puts "Adding #{ontology_instance.name} ontology."
+      Log4r::Logger['agent'].info "Adding #{ontology_instance.name} ontology"
       @ontologies << ontology_instance
     end
 

data/lib/cirrocumulus/facts.rb

@@ -74,9 +74,9 @@ class KnowledgeClass
     def to_template
       description = @@classes[self.name]
       fact = [description.name.to_sym]
-      fact << description.primary_key.upcase.to_sym
+      fact << description.primary_key.upcase.to_sym if description.primary_key
       description.properties.each do |k|
-        next if k == description.primary_key
+        next if k == description.primary_key && description.primary_key
 
         fact << k.to_sym
         fact << k.upcase.to_sym
@@ -106,7 +106,7 @@ class KnowledgeClass
     @values = {}
 
     description = @@classes[self.class.name]
-    if options.has_key?(description.primary_key.to_sym)
+    if description.primary_key && options.has_key?(description.primary_key.to_sym)
       @values[description.primary_key] = options[description.primary_key.to_sym]
     end
 
@@ -120,7 +120,7 @@ class KnowledgeClass
   def to_template
     description = @@classes[self.class.name]
     fact = [description.name.to_sym]
-    fact << values[description.primary_key]
+    fact << values[description.primary_key] if description.primary_key
     description.properties.each do |k|
       next if k == description.primary_key
 
@@ -134,9 +134,9 @@ class KnowledgeClass
   def to_params
     description = @@classes[self.class.name]
     fact = [description.name.to_sym]
-    fact << (values.has_key?(description.primary_key) ? values[description.primary_key] : description.primary_key.upcase.to_sym)
+    fact << (values.has_key?(description.primary_key) ? values[description.primary_key] : description.primary_key.upcase.to_sym) if description.primary_key
     description.properties.each do |k|
-      next if k == description.primary_key
+      next if k == description.primary_key && description.primary_key
 
       fact << k.to_sym
       fact << (values.has_key?(k) ? values[k] : k.upcase.to_sym)

data/lib/cirrocumulus/ontology.rb

@@ -95,6 +95,7 @@ class Ontology
     @classes = []
     @last_saga_id = 0
     @sagas = []
+    @last_tick_time = Time.now
 
     self.class.register_ontology_instance(self)
     @mutex = Mutex.new
@@ -112,6 +113,12 @@ class Ontology
 			while self.running do
 				ontology.timeout_facts
         @rule_queue.run_queued_rules
+
+        if Time.now - @last_tick_time > 1
+          ontology.tick
+          @last_tick_time = Time.now
+        end
+
 				sleep 0.1
 			end
 		end
@@ -219,7 +226,7 @@ class Ontology
   # Inform another agent about a fact. Normally, it will be added to it's KB.
   #
 	def inform(agent, fact, options = {})
-		puts "%25s | inform %s about %s %s" % [identifier, agent, Sexpistol.new.to_sexp(fact), print_message_options(options)]
+		info "%25s | inform %s about %s %s" % [identifier, agent, Sexpistol.new.to_sexp(fact), print_message_options(options)]
 
     channel = ChannelFactory.retrieve(identifier, agent)
     channel.inform(identifier, fact, options) if channel
@@ -233,7 +240,7 @@ class Ontology
   # The action of agreeing to perform some action, possibly in the future.
   #
   def agree(agent, action, options = {})
-    puts "%25s | agree with %s to perform %s %s" % [identifier, agent, Sexpistol.new.to_sexp(action), print_message_options(options)]
+    info "%25s | agree with %s to perform %s %s" % [identifier, agent, Sexpistol.new.to_sexp(action), print_message_options(options)]
 
     channel = ChannelFactory.retrieve(identifier, agent)
     channel.agree(identifier, action, options) if channel
@@ -243,7 +250,7 @@ class Ontology
   # The action of refusing to perform a given action, and explaining the reason for the refusal.
   #
   def refuse(agent, action, reason, options = {})
-    puts "%25s | refuse %s to perform %s because %s %s" % [identifier, agent, Sexpistol.new.to_sexp(action), Sexpistol.new.to_sexp(reason), print_message_options(options)]
+    info "%25s | refuse %s to perform %s because %s %s" % [identifier, agent, Sexpistol.new.to_sexp(action), Sexpistol.new.to_sexp(reason), print_message_options(options)]
 
     channel = ChannelFactory.retrieve(identifier, agent)
     channel.refuse(identifier, action, reason, options) if channel
@@ -253,7 +260,7 @@ class Ontology
   # The action of telling another agent that an action was attempted but the attempt failed.
   #
   def failure(agent, action, reason = true , options = {})
-    puts "%25s | inform %s that action %s failed with reason %s %s" % [identifier, agent, Sexpistol.new.to_sexp(action), Sexpistol.new.to_sexp(reason), print_message_options(options)]
+    info "%25s | inform %s that action %s failed with reason %s %s" % [identifier, agent, Sexpistol.new.to_sexp(action), Sexpistol.new.to_sexp(reason), print_message_options(options)]
 
     channel = ChannelFactory.retrieve(identifier, agent)
     channel.failure(identifier, action, reason, options) if channel
@@ -263,7 +270,7 @@ class Ontology
   # Send request to another agent.
   #
 	def request(agent, contents, options = {})
-		puts "%25s | %s -> %s" % [identifier.to_s, Sexpistol.new.to_sexp(contents), agent.to_s]
+		info "%25s | %s -> %s" % [identifier.to_s, Sexpistol.new.to_sexp(contents), agent.to_s]
 
 		channel = ChannelFactory.retrieve(identifier, agent)
 		channel.request(identifier, contents) if channel
@@ -274,7 +281,7 @@ class Ontology
 	end
 
 	def query(agent, expression, options = {})
-    puts "%25s | query %s about %s %s" % [identifier, agent, Sexpistol.new.to_sexp(expression), print_message_options(options)]
+    info "%25s | query %s about %s %s" % [identifier, agent, Sexpistol.new.to_sexp(expression), print_message_options(options)]
 
     channel = ChannelFactory.retrieve(identifier, agent)
     channel.query(identifier, expression, options) if channel
@@ -297,6 +304,11 @@ class Ontology
   #
   def restore_state; end
 
+  #
+  # Tick. Every second.
+  #
+  def tick; end
+
   #
   # Handles incoming fact. By default, just adds this fact to KB or redirects its processing to corresponding saga
   #
@@ -325,19 +337,19 @@ class Ontology
 
   def handle_agree(sender, action, options = {})
     if !handle_saga_reply(sender, :agree, action, options)
-      puts "%25s | %s agreed to perform %s %s" % [identifier, sender, Sexpistol.new.to_sexp(action), print_message_options(options)]
+      info "%25s | %s agreed to perform %s %s" % [identifier, sender, Sexpistol.new.to_sexp(action), print_message_options(options)]
     end
   end
 
   def handle_refuse(sender, action, reason, options = {})
     if !handle_saga_reply(sender, :refuse, [action, reason], options)
-      puts "%25s | %s refused to perform %s because %s %s" % [identifier, sender, Sexpistol.new.to_sexp(action), Sexpistol.new.to_sexp(reason), print_message_options(options)]
+      info "%25s | %s refused to perform %s because %s %s" % [identifier, sender, Sexpistol.new.to_sexp(action), Sexpistol.new.to_sexp(reason), print_message_options(options)]
     end
   end
 
   def handle_failure(sender, action, reason, options = {})
     if !handle_saga_reply(sender, :failure, [action, reason], options)
-      puts "%25s | %s failed to perform %s because %s %s" % [identifier, sender, Sexpistol.new.to_sexp(action), Sexpistol.new.to_sexp(reason), print_message_options(options)]
+      info "%25s | %s failed to perform %s because %s %s" % [identifier, sender, Sexpistol.new.to_sexp(action), Sexpistol.new.to_sexp(reason), print_message_options(options)]
     end
   end
 
@@ -346,12 +358,12 @@ class Ontology
   #
 	def handle_request(sender, contents, options = {})
     if !handle_saga_reply(sender, :request, contents, options)
-      puts "%25s | %s requests to perform %s %s" % [identifier, sender, Sexpistol.new.to_sexp(contents), print_message_options(options)]
+      info "%25s | %s requests to perform %s %s" % [identifier, sender, Sexpistol.new.to_sexp(contents), print_message_options(options)]
     end
   end
 
   def handle_query(sender, expression, options = {})
-    puts "%25s | %s queries %s %s" % [identifier, sender, Sexpistol.new.to_sexp(expression), print_message_options(options)] unless handle_saga_reply(sender, :query, expression, options)
+    info "%25s | %s queries %s %s" % [identifier, sender, Sexpistol.new.to_sexp(expression), print_message_options(options)] unless handle_saga_reply(sender, :query, expression, options)
   end
 
   #
@@ -425,8 +437,12 @@ class Ontology
     "[%s]" % options.map {|k,v| "%s=%s" % [k, v]}.join(',')
   end
 
+  def info(msg)
+    Log4r::Logger['ontology'].info(msg)
+  end
+
 	def debug(msg)
-		puts "[DBG] %s" % msg
+		Log4r::Logger['ontology'].debug(msg)
 	end
 
 end

data/lib/cirrocumulus/rule_queue.rb

@@ -25,7 +25,17 @@ class RuleQueue
 
   def push(entry)
     @mutex.synchronize do
-      @queue.push(QueueEntry.new(entry)) unless @queue.find {|e| e.state != :finished && e.run_data == entry}
+      return if @queue.find {|e| e != :marker && e.state != :finished && e.run_data == entry}
+
+      if entry.rule.options.has_key?(:for)
+        delay = entry.rule.options[:for]
+        run_at = Time.now + delay
+        debug("Enqueued rule #{entry.rule.name}#{entry.parameters.inspect}")
+        debug("And will execute this rule after #{delay} sec (at #{run_at.strftime("%H:%M:%S %d.%m.%Y")})")
+        @queue.push(QueueEntry.new(entry, run_at))
+      else
+        @queue.push(QueueEntry.new(entry))
+      end
     end
   end
 
@@ -42,10 +52,13 @@ class RuleQueue
   end
 
   def run_queued_rules
-    while (entry = pop) != nil do
+    @queue.push :marker
+
+    while (entry = pop) != :marker do
       next if entry.state == :finished
-      if entry.run_at && (entry.run_at < Time.now)
-        push(entry)
+
+      if !entry.run_at.nil? && (entry.run_at > Time.now)
+        @queue.push(entry)
         next
       end
 
@@ -55,7 +68,7 @@ class RuleQueue
           entry.rule.code.call(@ontology_instance, entry.params)
           entry.state
         rescue Exception => e
-          puts "[WARN] Exception while executing rule: %s\n%s" % [e.to_s, e.backtrace.to_s]
+          warn "Exception while executing rule: %s\n%s" % [e.to_s, e.backtrace.to_s]
         end
       end
     end
@@ -64,6 +77,11 @@ class RuleQueue
   private
 
   def debug(msg)
-    puts msg
+    Log4r::Logger['ontology::run_queue'].debug(msg)
   end
+
+  def warn(msg)
+    Log4r::Logger['ontology::run_queue'].warn(msg)
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cirrocumulus
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
   prerelease: 
 platform: ruby
 authors: