ocular 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbbe06b9f1a923d61d62e97f6e8dcc3dfc487276
-  data.tar.gz: d2c0be7553d44f37c773ec599c26ad126fec2298
+  metadata.gz: 648cb29cda1d62aec449575ab959c8b76c62e9e0
+  data.tar.gz: 4aa22c197a871dfc6b9f8c7082e36aeb98361d8e
 SHA512:
-  metadata.gz: 0a2479bffb96f0965d536a53966d70a80923bc62f3b60b2b74de430392320e898ff811c98a974aa5553b43ee07efd3bba2ab7f1229cfcc4fdcf8feb8f055b303
-  data.tar.gz: ca3fe3688918efff60ad88f6d026f8dae055fd9adbeb410ba9dc7112594efe043946c57ab35d5d739dd736284f7ee17a4eaeee7c4f3e5fe3cc0a5ff03e260484
+  metadata.gz: d8412dd38f44a2858187e00417db2afe1a8f842eb2fef96a3d209fb99df1461270f67b5f693f006088687a83dc8db8a449bfafe8b9dad4f774c157ecc177ca93
+  data.tar.gz: 76b31a5c15a8feedeef0132715b899c0a5c82e98a773e07374eeaf6c5380831cc55906638900b1b1a1bdfb26e2c5d2194fffddf14e769b359bf1bcb7bd37a729

data/bin/ocular

@@ -24,6 +24,7 @@ class OptparseExample
     options.settings = nil
     options.root = nil
     options.check = nil
+    options.level = "DEBUG"
 
     opt_parser = OptionParser.new do |opts|
       opts.banner = "Usage in shell mode: \"ocular [options] <script file>\" or server mode: \"ocular --server [options]\""
@@ -64,6 +65,10 @@ class OptparseExample
         options.check = true
       end
 
+      opts.on("--level LEVEL", "Log level") do |level|
+        options.level = level
+      end
+
     end
 
     opt_parser.parse!(args)
@@ -106,7 +111,10 @@ if Ocular::Settings.get(:loggers)
   Ocular::Settings.get(:loggers).each do |name, settings|
     name = name.to_s
     if name == "console"
-      logger.add_logger(Ocular::Logging::ConsoleLogger.new(settings))
+      console_logger = Ocular::Logging::ConsoleLogger.new(settings)
+      console_logger.set_level(options.level)
+      logger.add_logger(console_logger)
+
     elsif name == "kafka"
       logger.add_logger(Ocular::Logging::KafkaLogger.new(settings))
     else
@@ -117,6 +125,8 @@ else
   logger.add_logger(Ocular::Logging::ConsoleLogger.new)
 end
 
+Ocular.set_global_logger(logger)
+
 if options.server or options.syntax
   if !options.root && !Ocular::Settings.get(:script_root)
     puts "Please specify --root or set script_root in the settings.yaml"
@@ -132,7 +142,7 @@ if options.server or options.syntax
 
   daemon.start_input_handlers()
 
-  puts "server started"
+  Ocular.logger.info "server started"
   daemon.wait()
 
 else

data/lib/ocular/dsl/orbit.rb

@@ -17,7 +17,6 @@ class Ocular
                     orbit_endpoints = []
                     begin
                         endpoints = @etcd.get("/orbit/services/#{service_name}/endpoints").node.children
-                        pp endpoints
                         endpoints.each do |node|
                           ip = node.key.match(/.*endpoints.(.+?):.+/).captures[0]
                           orbit_endpoints << ip

data/lib/ocular/inputs/http_input.rb

@@ -531,6 +531,7 @@ class Ocular
                     if @settings[:verbose]
                       @app = Rack::CommonLogger.new(@app, STDOUT)
                     end
+                    ::Ocular.logger.debug "Puma HTTP server started with settings #{@settings}"
 
                     @thread = Thread.new do
                         events_hander = @settings[:silent] ? ::Puma::Events.strings : ::Puma::Events.stdio

data/lib/ocular/logging/console_logger.rb

@@ -1,3 +1,4 @@
+require 'ocular/logging/severity.rb'
 
 class Ocular
     module Logging
@@ -8,7 +9,37 @@ class Ocular
             def initialize(settings=nil)
                 @level = Severity::INFO
                 @formatter = Formatter.new
-            end            
+            end
+
+            def set_level(level)
+                l = Severity::LABELS.index(level)
+                if l == nil
+                    puts "Invalid debug level #{level}. Supported levels: #{Severity::LABELS}"
+                    l = 0
+                end
+                @level = l
+            end
+
+            def debug(message = nil, &block)
+                add(Severity::DEBUG, message, @run_id, &block)
+            end
+            alias log debug
+
+            def info(message = nil, &block)
+                add(Severity::INFO, message, @run_id, &block)
+            end
+
+            def warn(message = nil, &block)
+                add(Severity::WARN, message, @run_id, &block)
+            end
+
+            def error(message = nil, &block)
+                add(Severity::ERROR, message, @run_id, &block)
+            end
+
+            def fatal(message = nil, &block)
+                add(Severity::FATAL, message, @run_id, &block)
+            end        
 
             def add(severity, message = nil, run_id = nil, &block)
                 severity ||= Severity::UNKNOWN

data/lib/ocular/logging/kafka_logger.rb

@@ -1,4 +1,5 @@
 require "kafka"
+require "socket"
 
 class Ocular
     module Logging
@@ -20,6 +21,27 @@ class Ocular
                 @producer = @kafka.producer
             end            
 
+            def debug(message = nil, &block)
+                add(Severity::DEBUG, message, @run_id, &block)
+            end
+            alias log debug
+
+            def info(message = nil, &block)
+                add(Severity::INFO, message, @run_id, &block)
+            end
+
+            def warn(message = nil, &block)
+                add(Severity::WARN, message, @run_id, &block)
+            end
+
+            def error(message = nil, &block)
+                add(Severity::ERROR, message, @run_id, &block)
+            end
+
+            def fatal(message = nil, &block)
+                add(Severity::FATAL, message, @run_id, &block)
+            end
+
             def add(severity, message = nil, run_id = nil, &block)
                 severity ||= Severity::UNKNOWN
                 if severity < @level
@@ -68,7 +90,8 @@ class Ocular
                         "level" => Ocular::Logging::Severity::LABELS[severity],
                         "@timestamp" => format_datetime(time),
                         "run_id" => progname,
-                        "msg" => msg2str(msg)
+                        "msg" => msg2str(msg),
+                        "host" => hostname
                     } 
                     return data.to_json
                 end
@@ -77,6 +100,7 @@ class Ocular
                     data = {
                         "@timestamp" => format_datetime(time),
                         "run_id" => progname,
+                        "host" => hostname
                     }
                     data[property] = value
                     return data.to_json
@@ -87,7 +111,8 @@ class Ocular
                         "@timestamp" => format_datetime(time),
                         "run_id" => progname,
                         "triggered_by" => type,
-                        "environment" => environment
+                        "environment" => environment,
+                        "host" => hostname
                     }
 
                     return data.to_json
@@ -110,6 +135,13 @@ class Ocular
                         msg.inspect
                     end
                 end
+
+                def hostname
+                    if !@hostname
+                        @hostname = Socket.gethostname
+                    end
+                    return @hostname
+                end
             end
         end
     end

data/lib/ocular/logging/multilogger.rb

@@ -14,6 +14,27 @@ class Ocular
                 @loggers << logger
             end
 
+            def debug(message = nil, &block)
+                add(Severity::DEBUG, message, @run_id, &block)
+            end
+            alias log debug
+
+            def info(message = nil, &block)
+                add(Severity::INFO, message, @run_id, &block)
+            end
+
+            def warn(message = nil, &block)
+                add(Severity::WARN, message, @run_id, &block)
+            end
+
+            def error(message = nil, &block)
+                add(Severity::ERROR, message, @run_id, &block)
+            end
+
+            def fatal(message = nil, &block)
+                add(Severity::FATAL, message, @run_id, &block)
+            end
+
             def add(severity, message = nil, run_id = nil, &block)
 
                 if message.nil?

data/lib/ocular/logging/severity.rb

@@ -1,4 +1,3 @@
-require 'logger'
 
 class Ocular
     module Logging

data/lib/ocular/ocular.rb

@@ -1,7 +1,21 @@
+require 'ocular/logging/console_logger.rb'
+
+$ocular_global_logger = Ocular::Logging::ConsoleLogger.new
+
+class Ocular
+
+    def self.logger
+        return $ocular_global_logger
+    end
+
+    def self.set_global_logger(logger)
+        $ocular_global_logger = logger
+    end
+end
 
 require 'ocular/version'
-require 'ocular/settings'
 require 'ocular/logging/logging'
+require 'ocular/settings'
 require 'ocular/event/eventbase'
 require 'ocular/event/eventfactory'
 require 'ocular/dsl/dsl'
@@ -11,3 +25,5 @@ require 'ocular/inputs/handlers'
 require 'ocular/inputs/base'
 require 'ocular/inputs/http_input'
 require 'ocular/daemon'
+
+

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.11"
+    Version = "0.1.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Juho Mäkinen