oml4r 2.10.1 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2360b53959ca90561c568582edbc71e7b21f840
-  data.tar.gz: 058568d1d397366c4a0a8af0cba0ea0633eb154e
+  metadata.gz: ac0d927de25844aef4430946426fd21fb2996301
+  data.tar.gz: 869927e388d2c20e5533522cb3d041cf905637bf
 SHA512:
-  metadata.gz: a2941e684c41b8843e64451f1108e3d2648ce5fac335dfdb6db6e83038dc55e62deab6063302c897709713c2eba5110fc9f72bfd7e38fb6f3c65367296275f07
-  data.tar.gz: e5805b621d247a1b5104393b3f1f08d415eccc07199d73f38c84a31c4af62cd49ca4c16b778566db6c35565d5280ad5bc2ce17b99e65ecefd05682e13a660d2e
+  metadata.gz: cfbe00962c39cfcf23a05dff15a1f7c43868851783aa75702a88e351d9b259ab5bc4bb72e824cd5d07019abf5243ed251824563c44856141d92e578d276d5605
+  data.tar.gz: 2170da7ed5cb58fd6b0c2312aabffcfa2aa9dd7a8648810e3b64c7107f25ec2c91f03b4161759d54d42e1e3b91e227eaa365ed0da9e68fb305d9f3c7b434cce5

data/examples/oml4r-logging.rb

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+ 
+require 'oml4r/logging/oml4r_appender'
+ 
+appender = Logging.appenders.oml4r('oml4r',
+  :appName => 'log-tester',
+  :domain => 'foo',
+  :collect => 'file:-')
+ 
+log = Logging.logger[self]
+log.add_appenders 'oml4r'
+ 
+log.info 'Info Message'
+log.debug 'Debug Message'
+log.info ({:a => 1, :b => 2, :c => 3})
+
+appender.close

data/lib/oml4r/logging/oml4r_appender.rb

@@ -0,0 +1,50 @@
+require 'logging'
+require 'oml4r'
+
+module Logging::Appenders
+
+  def self.oml4r *args
+    return Logging::Appenders::Oml4r if args.empty?
+    Logging::Appenders::Oml4r.new *args
+  end
+
+  class Oml4r < Logging::Appender
+
+    class LogMP < OML4R::MPBase
+      name :Log
+      param :data, :type => :string
+      param :file, :type => :string
+      param :level, :type => :string
+      param :line, :type => :string
+      param :logger, :type => :string
+      param :method, :type => :string
+      param :time, :type => :string
+    end
+
+    # pass a name and the usual OML options here to configure oml4r
+    def initialize *args
+      opts = Hash === args.last ? args.pop : {}
+      name = args.empty? ? 'oml4r' : args.shift
+      super(name, opts)
+      begin
+        OML4R::init(nil, opts)
+      rescue OML4R::MissingArgumentException => mex
+        $stderr.puts mex
+        exit
+      end
+    end
+
+    def close *args
+      super(false)
+      OML4R::close()
+    end
+
+    private
+
+    def write(event)
+      LogMP.inject(event.data,event.file,event.level,event.line,event.logger,event.method,event.time)
+      self
+    end
+
+  end # class Oml4r
+end # module

data/lib/oml4r/version.rb

@@ -5,7 +5,7 @@
 # ------------------
 
 module OML4R
-  VERSION = "2.10.1"
+  VERSION = "2.10.2"
   VERSION_STRING = "OML4R Client V#{VERSION}"
   COPYRIGHT = "Copyright 2009-2014, NICTA"
 end

data/lib/oml4r.rb

@@ -114,13 +114,15 @@ module OML4R
     # Set a metric for this MP
     # - name = name of the metric to set
     # - opts = a Hash with the options for this metric
-    #          Only supported option is :type = { :string | :int32 | :double | :bool | :guid }
+    #          Only supported option is :type = { :string | :int32 | :uint32 | :int64 | :uint64 | :double | :bool | :guid |
+    #          [ DEPRECATED :long | :integer ] }
     def self.param(name, opts = {})
       o = opts.dup
       o[:name] = name
       o[:type] ||= :string
-      if :long == o[:type]
-        OML4R.logger.warn ":long is deprecated use, :int32 instead"
+      if :long == o[:type] or :integer == o[:type]
+	# XXX: :name in :name... See #1527 bullet point 3
+        OML4R.logger.warn "Type #{o[:type]} for #{__def__()[:name][:name]}.#{o[:name]} is deprecated, use :int32 instead"
         o[:type] = :int32
       end
       __def__()[:p_def] << o

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oml4r
 version: !ruby/object:Gem::Version
-  version: 2.10.1
+  version: 2.10.2
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies: []
 description: '["Simple OML client library and applications for Ruby"]'
 email:
@@ -40,6 +40,7 @@ files:
 - bin/oml4r-zabbix
 - bin/ping-oml2
 - bin/test_types
+- examples/oml4r-logging.rb
 - examples/oml4r-multiple-channel-example.rb
 - examples/oml4r-neuca-beacon.rb
 - examples/oml4r-orca-beacon.rb
@@ -51,6 +52,7 @@ files:
 - lib/oml4r.rb
 - lib/oml4r/benchmark.rb
 - lib/oml4r/log4r/oml_outputter.rb
+- lib/oml4r/logging/oml4r_appender.rb
 - lib/oml4r/version.rb
 - omf/README
 - omf/ping-oml2.app.rb
@@ -75,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: '["This is a simple client library for OML which does not use liboml2 and
@@ -83,3 +85,4 @@ summary: '["This is a simple client library for OML which does not use liboml2 a
   can use this library to create ruby applications which can send measurement to the
   OML collection server. The gem ships with some example applications."]'
 test_files: []
+has_rdoc: