cirrocumulus 0.2.6 → 0.2.8

data/VERSION

@@ -1 +1 @@
-0.2.6
+0.2.8

data/cirrocumulus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cirrocumulus}
-  s.version = "0.2.6"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anton Kosyakin"]
-  s.date = %q{2011-09-27}
+  s.date = %q{2011-10-11}
   s.description = %q{Engine for building your own agents, providing you base functionality for loading ontologies, communicating with other agents and parsing FIPA-ACL messages}
   s.email = %q{deil@mneko.net}
   s.extra_rdoc_files = [

data/lib/cirrocumulus/engine.rb

@@ -82,16 +82,7 @@ class Cirrocumulus
   end
 
   def run(agent, kb, sniff = false)
-    suffix = agent.default_ontology ? agent.default_ontology.gsub('cirrocumulus-', '') : @suffix
-    @jid = if @generate_jid
-      _, hostname = systemu 'hostname'
-      hostname.strip!
-      "%s-%s" % [hostname, suffix]
-    else
-      suffix
-    end
-    Log4r::Logger['cirrocumulus'].info "logging as " + @jid
-    connect()
+    connect(generate_jid(agent))
 
     Log4r::Logger['cirrocumulus'].info("entering main loop")
     agent.restore_state()
@@ -102,9 +93,10 @@ class Cirrocumulus
       kb.collect_knowledge()
       
       begin
-        connect() if @im.nil? || !@im.connected?
+        connect(generate_jid(agent)) if @im.nil? || !@im.connected?
       rescue Exception => e
         puts e.to_s
+        sleep 5
       end
       
       next if @im.nil? || !@im.connected?
@@ -149,7 +141,21 @@ class Cirrocumulus
   
   private
   
-  def connect()
+  def generate_jid(agent)
+    suffix = agent.default_ontology ? agent.default_ontology.gsub('cirrocumulus-', '') : @suffix
+    if @generate_jid
+      _, hostname = systemu 'hostname'
+      hostname.strip!
+      "%s-%s" % [hostname, suffix]
+    else
+      suffix
+    end
+  end
+  
+  def connect(jid)
+    @jid = jid
+    Log4r::Logger['cirrocumulus'].info "logging as " + @jid
+  
     begin
       @im.disconnect if @im && @im.connected?
       full_jid = @jid + "@" + JABBER_SERVER

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cirrocumulus
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Anton Kosyakin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-27 00:00:00 +04:00
+date: 2011-10-11 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency