ocular 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbfcb2c3150071d3ee29a6c4a0d300b97cab206c
-  data.tar.gz: 4140eef91ec116b9a72d48c079dfbd16c63e53d0
+  metadata.gz: b708d299a7b3b89d8a5cafd01e951e425c92f5a9
+  data.tar.gz: d38f64555894415292a57b0f6fd2533d18f1e61f
 SHA512:
-  metadata.gz: 794a5efa19b04455b2b1030388bd7dc281f61961f805e9db94c785758e0aad2fb8fed2ede3f5d520d6da54245f3a19b7b139a40bbc1bcdcbf3f20e3993943384
-  data.tar.gz: 0fa2f6fd4b8d51c25d190a03f5da1e5872eb60f1f2a68579c552561d8c6f11da49dcd1cfe456a2be93d0fc153df6c1c832b778863afd71831cda6e55dcc2e50c
+  metadata.gz: 3a3b598021d288280c3ea97e4e899fd5ddc47ed291701ea36c4563a819cc3d017e85d766d47fffb78b72d9c8b0bfbbadef259505d0c5a12bcceb6d152cdc84f6
+  data.tar.gz: d17343570d2be86673a7785e640acf8ff0edde04d86136bc2640fbc5f6b266db5a6e4d734415e818ceee3bdebc157936f94103a35613daaa97f77d3e2974eda6

data/lib/ocular/dsl/fog.rb

@@ -56,6 +56,18 @@ class Ocular
                 return ret.first
             end
 
+            add_help "find_server_by_id", "Returns Fog::Compute::AWS::Server or nil"
+            def find_server_by_id(id)
+                ret = aws().servers.all("instance-id" => id)
+                if ret.length > 1
+                    raise "Too many matching servers by just one ip #{ip}"
+                end
+                if ret.length == 0
+                    return nil
+                end
+                return ret.first
+            end
+
         end
 
     end

data/lib/ocular/dsl/runcontext.rb

@@ -9,6 +9,7 @@ class Ocular
             attr_accessor :proxy
             attr_accessor :class_name
             attr_accessor :event_signature
+            attr_accessor :logger
 
             include Ocular::DSL::Logging
             include Ocular::DSL::SSH
@@ -43,6 +44,10 @@ class Ocular
                     i.call()
                 end
             end
+
+            def after_fork()
+                @logger.reconnect()
+            end
         end
 
         class REPLRunContext < RunContext

data/lib/ocular/event/eventbase.rb

@@ -40,6 +40,8 @@ class Ocular
                     reader.close
                     r = Results.new
 
+                    context.after_fork()
+
                     begin
                         r.response = __call(context, @callback)
                     rescue Exception => error
@@ -65,6 +67,7 @@ class Ocular
                 if r.error
                     raise r.error
                 end
+                puts "done"
                 return r.response
             end
 

data/lib/ocular/logging/console_logger.rb

@@ -39,7 +39,10 @@ class Ocular
 
             def fatal(message = nil, &block)
                 add(Severity::FATAL, message, @run_id, &block)
-            end        
+            end
+
+            def reconnect()
+            end
 
             def add(severity, message = nil, run_id = nil, &block)
                 severity ||= Severity::UNKNOWN

data/lib/ocular/logging/kafka_logger.rb

@@ -14,13 +14,18 @@ class Ocular
                 if kafka != nil
                     @kafka = kafka
                 else
+                    pp settings
                     @kafka = Kafka.new(settings[:client])
                 end
                 @settings = settings
 
                 @producer = @kafka.producer
-            end            
+            end
 
+            def reconnect()
+                @kafka = Kafka.new(@settings[:client])
+            end
+            
             def debug(message = nil, &block)
                 add(Severity::DEBUG, message, @run_id, &block)
             end
@@ -56,23 +61,41 @@ class Ocular
                     end
                 end
 
-                @producer.produce(@formatter.format_message(severity, Time.now, run_id, message), topic: @settings[:topic], partition_key: run_id)
-                @producer.deliver_messages
+                begin
+                    @producer.produce(@formatter.format_message(severity, Time.now, run_id, message), topic: @settings[:topic], partition_key: run_id)
+                    @producer.deliver_messages
+                rescue RuntimeError => e
+                    STDERR.puts "Error on producing kafka message: #{e}"
+                end
             end
 
             def log_event(property, value, run_id = nil)
-                @producer.produce(@formatter.format_event(property, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
-                @producer.deliver_messages
+                begin
+                    @producer.produce(@formatter.format_event(property, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
+                    @producer.deliver_messages
+                rescue RuntimeError => e
+                    STDERR.puts "Error on producing kafka log_event: #{e}"
+                end
             end
 
             def log_cause(type, environment, run_id = nil)
-                @producer.produce(@formatter.format_cause(type, environment, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
-                @producer.deliver_messages
+                begin
+                    @producer.produce(@formatter.format_cause(type, environment, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
+                    @producer.deliver_messages
+                rescue RuntimeError => e
+                    STDERR.puts "Error on producing kafka log_cause: #{e}"
+                end
+
             end
 
             def log_timing(key, value, run_id = nil)
-                @producer.produce(@formatter.format_event("timing:" + key, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
-                @producer.deliver_messages
+                begin
+                    @producer.produce(@formatter.format_event("timing:" + key, value, Time.now, run_id), topic: @settings[:topic], partition_key: run_id)
+                    @producer.deliver_messages
+                rescue RuntimeError => e
+                    STDERR.puts "Error on producing kafka log_timing: #{e}"
+                end
+
             end
 
             # Default formatter for log messages.

data/lib/ocular/logging/multilogger.rb

@@ -35,6 +35,12 @@ class Ocular
                 add(Severity::FATAL, message, @run_id, &block)
             end
 
+            def reconnect()
+                @loggers.each do |logger|
+                    logger.reconnect()
+                end
+            end
+
             def add(severity, message = nil, run_id = nil, &block)
 
                 if message.nil?

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.19"
+    Version = "0.1.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye