oml4r 2.9.1 → 2.9.3

data/README.md

@@ -6,7 +6,7 @@ filters, but connects directly to the server using the text protocol [oml-text].
 User can use this library to create ruby applications which can send
 measurement to the OML collection server. A simple example on how to use
 this library is attached at the end of this file. Another example can be
-found in the file oml4r-example.rb
+found in the file oml4r-example.rb .
 
 Installation
 ------------
@@ -78,3 +78,8 @@ See examples files oml4r-simple-example.rb and oml4r-wlanconfig.rb.
 
 [oml-text]: http://oml.mytestbed.net/projects/oml/wiki/Description_of_Text_protocol
 [oml4r-rubygem]: https://rubygems.org/gems/oml4r/
+
+License
+-------
+
+Please see LICENSE.txt

data/examples/oml4r-multiple-channel-example.rb

@@ -0,0 +1,79 @@
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+# ------------------
+#
+# = oml4r-multiple-channel-example.rb
+#
+# == Description
+#
+# An extension of the 'oml4r-simple.example.rb' example demonstrating the use of
+# multiple destinations for different measurements.
+#
+# == Usage
+#
+# The following write the COS measurements to STDOUT (file:-) and the SIN 
+# measurements to /tmp/ch2.oml (which can be overwrriten with the --oml-ch2 option)
+#
+# % cd $OML_HOME
+# % ruby -I lib examples/oml4r-multiple-channel-example.rb --oml-ch1 file:-
+#
+# Use --oml-help to get all available options
+#
+# % cd $OML_HOME
+# % ruby -I lib examples/oml4r-multiple-channel-example.rb --oml-help
+# 
+require 'rubygems'
+require 'oml4r'
+
+# Define your own Measurement Points
+class SinMP < OML4R::MPBase
+  name :sin
+  channel :ch1
+
+  param :label
+  param :angle, :type => :int32
+  param :value, :type => :double
+end
+
+class CosMP < OML4R::MPBase
+  name :cos
+  channel :ch2
+
+  param :label
+  param :value, :type => :double
+end
+
+# Initialise the OML4R module for your application
+opts = {
+  :appName => 'oml4rSimpleExample',
+  :domain => 'foo',
+  :create_default_channel => false  # we don't need the default channel
+} 
+#  
+ch1 = OML4R::create_channel(:ch1, 'file:/tmp/ch1.oml')    
+ch2 = OML4R::create_channel(:ch2, 'file:/tmp/ch2.oml')    
+
+begin
+  OML4R::init(ARGV, opts) do |op|
+    op.on("--oml-ch1 URL", "Set destination for Channel 1 [#{ch1.url}]") { |url| ch1.url = url }
+    op.on("--oml-ch2 URL", "Set destination for Channel 2 [#{ch2.url}]") { |url| ch2.url = url }
+  end
+rescue OML4R::MissingArgumentException => mex
+  $stderr.puts mex
+  exit
+end
+
+# Now collect and inject some measurements
+500.times do |i|
+  sleep 0.5
+  angle = 15 * i
+  SinMP.inject("label_#{angle}", angle, Math.sin(angle))
+  CosMP.inject("label_#{angle}", Math.cos(angle))    
+end
+
+# Don't forget to close when you are finished
+OML4R::close()
+
+# vim: sw=2

data/examples/oml4r-neuca-beacon.rb

@@ -0,0 +1,52 @@
+#!/usr/bin/env ruby
+
+# Observes network connectivity on ExoGENI slices
+# Sends UDP broadcast messages and reports incoming messages via OML
+# (including its own) to build a connectivity graph
+
+require 'rubygems'
+require 'eventmachine'
+require 'oml4r'
+require 'parseconfig'
+
+port = 9089
+interval = 10
+neuca_file = "/tmp/neuca-user-data.txt"
+
+abort "Could not run 'neuca-user-data'" if !`neuca-user-data > #{neuca_file}`
+neuca_user_data = ParseConfig.new(neuca_file)['global']
+
+class MyMP < OML4R::MPBase
+  name :received
+  param :actor_id, :type => :string
+  param :slice_id, :type => :string
+  param :reservation_id, :type => :string
+  param :unit_id, :type => :string
+end
+
+oml_opts = {:appName => 'beacon', :domain => neuca_user_data['slice_id'],
+  :nodeID => neuca_user_data['unit_id'], :collect => 'file:-'}
+
+node = OML4R::init(ARGV, oml_opts) do |op|
+  op.banner = "Usage: #{$0} [options]\n"
+  op.on( '-i', '--interval n', "Send UDP broadcast beacon every n seconds [#{interval}]" ) do |i|
+    interval = i.to_i
+  end
+end
+
+module ServerSocket
+    def receive_data data
+        d=eval(data)
+        return if d.class != Hash
+        MyMP.inject(d['actor_id'], d['slice_id'], d['reservation_id'], d['unit_id'])
+    end
+end
+
+EventMachine.run {
+    socket = EventMachine.open_datagram_socket "0.0.0.0", port, ServerSocket
+    EventMachine.add_periodic_timer(interval) {
+      socket.send_datagram(neuca_user_data, "255.255.255.255", port)
+    }
+}
+
+OML4R::close()

data/examples/oml4r-orca-beacon.rb

@@ -0,0 +1,56 @@
+#!/usr/bin/env ruby
+
+# Observes network connectivity on ORCA slices
+# Sends UDP broadcast messages and reports incoming messages via OML
+# (including its own) to build a connectivity graph
+
+require 'rubygems'
+require 'eventmachine'
+require 'oml4r'
+require 'system/getifaddrs'
+
+port = 9089
+interval = 10
+ip_addresses = []
+NAME = ENV['OML_ID']
+oml_opts = {:appName => 'beacon', :collect => 'file:-'}
+
+abort "Please set the OML_ID environment variable" if NAME.nil?
+
+System.get_ifaddrs.each do |ip|
+  # don't report IP address of loopback interface
+  next if ip[0]==:lo
+  ip_addresses << ip[1][:inet_addr]
+end
+
+class MyMP < OML4R::MPBase
+  name :received
+  param :receiver_name, :type => :string
+  param :sender_name, :type => :string
+  param :ip_addresses, :type => :string
+end
+
+OML4R::init(ARGV, oml_opts) do |op|
+  op.banner = "Usage: #{$0} [options]\n"
+  op.on( '-i', '--interval n', "Send UDP broadcast beacon every n seconds [#{interval}]" ) do |i|
+    interval = i.to_i
+  end
+end
+
+module ServerSocket
+    def receive_data data
+        d=eval(data)
+        return if d.class != Hash
+        # don't log my own beacons
+        MyMP.inject(NAME, d[:sender_name], d[:ip_addresses]) if NAME != d[:sender_name] 
+    end
+end
+
+EventMachine.run {
+    socket = EventMachine.open_datagram_socket "0.0.0.0", port, ServerSocket
+    EventMachine.add_periodic_timer(interval) {
+      socket.send_datagram({:sender_name => NAME, :ip_addresses=> ip_addresses.join(' ')}, "255.255.255.255", port)
+    }
+}
+
+OML4R::close()

data/examples/oml4r-solar.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'oml4r'
+require 'nokogiri'
+require 'open-uri'
+
+# collects live solar power production data from the front page
+# of the SMA 'Sunny Webbox' plant management web interface
+# and inserts it into OML
+
+def convert_to_W(p)
+  a=p.split(" ")
+  case a[1]    
+  when "W"
+    return a[0].to_f
+  when "kW", "kWh"
+    return a[0].to_f*1000
+  when "MW", "MWh"
+    return a[0].to_f*1000000
+  when "GW", "GWh"
+    # 1.21 gigawatts!!
+    return a[0].to_f*1000000000
+  end
+end
+
+# Define your own Measurement Point
+class MyMP < OML4R::MPBase
+  name :Power
+  param :ts, :type => :string  
+  param :Now_W, :type => :double
+  param :DailyYield_Wh, :type => :double
+  param :TotalYield_Wh, :type => :double  
+end
+
+# poll every second by default
+interval = 1
+host = nil
+
+# Initialise the OML4R module for your application
+oml_opts = {:appName => 'webbox',
+  :domain => 'webbox-solar-live', :nodeID => 'plant1',
+  :collect => 'file:-'}
+
+node = OML4R::init(ARGV, oml_opts) do |op|
+  op.banner = "Usage: #{$0} [options] webbox_ip_addr ...\n"
+  op.on( '-i', '--interval SEC', "Query interval in seconds [#{interval}]" ) do |i|
+    interval = i.to_i
+  end
+  op.on( '-w', '--webbox HOST', "Hostname or IP address of Sunny Webbox" ) do |w|
+    host = w
+  end
+end
+
+abort "Please specify the hostname or IP address of the Sunny Webbox ('-w')." if host.nil?
+
+# catch CTRL-C
+exit_requested = false
+Kernel.trap( "INT" ) { exit_requested = true }
+
+# poll Sunny Webbox
+while !exit_requested
+  doc = Nokogiri::HTML(open("http://#{host}/home.htm"))
+  p=convert_to_W(doc.xpath('//td[@id="Power"]').text)
+  d=convert_to_W(doc.xpath('//td[@id="DailyYield"]').text)
+  t=convert_to_W(doc.xpath('//td[@id="TotalYield"]').text)
+  # do not collect data when no power is generated
+  next if p==0
+  # inject the measurements
+  MyMP.inject(Time.now,p,d,t)
+  sleep interval
+end
+
+OML4R::close()

data/examples/oml4r-wlanconfig.rb

@@ -75,7 +75,7 @@ class Wrapper
 
     # Now call the Init of OML4R with the command line arguments (args)
     # and a block defining the arguments specific to this wrapper
-    OML4R::init(args, :appName => "#{APPNAME}_wrapper") { |argParser|
+    OML4R::init(args, :appName => "#{APPNAME}_wrapper", :domain => 'foo', :collect => 'file:-') { |argParser|
       argParser.banner = "\nExecute a wrapper around #{APPNAME}\n" +
 	"Use -h or --help for a list of options\n\n" 
       argParser.on("-i", "--interface IFNAME", "Name of Interface to monitor") { |name| @interface = name }

data/lib/oml4r/log4r/oml_outputter.rb

@@ -0,0 +1,105 @@
+# Copyright (c) 2013 National ICT Australia Limited (NICTA).
+# This software may be used and distributed solely under the terms of the MIT license (License).
+# You should find a copy of the License in LICENSE.TXT or at http://opensource.org/licenses/MIT.
+# By downloading or using this software you accept the terms and the liability disclaimer in the License.
+# ------------------
+
+require 'log4r/outputter/outputter'
+require 'oml4r'
+require 'time'
+
+module Log4r
+
+  # Log4r outputter which turn logging events into an OML stream
+  #
+  class OmlOutputter < Log4r::Outputter
+
+    class LogEventMP < OML4R::MPBase
+      name :log #, add_prefix: false
+
+      param :level, :type => :int32
+      param :name
+      param :tracer
+      param :data
+    end
+
+
+    # Initialise an outputter which turns logging messages
+    # into an OML stream
+    #
+    # param name Name of outputter
+    # param opts Options for setting up OML
+    # opts collect If set to an URL, then initialise OML otherwise assume that someone else is doing it
+    # opts domain OML domain to send to (assumes that 'collect' is set) ['log']
+    # opts appName OML domain to send to (assumes that 'collect' is set) [fileName-time-pid]
+    #
+    def initialize(name, opts = {})
+      super(name, opts)
+      if url = opts['collect']
+        h = {}
+        opts.each {|k, v| h[k.to_sym] = v}
+        opts = h
+
+        opts[:domain] ||= 'log'
+        opts[:appName] ||= File.basename(__FILE__, '.*')
+        opts[:id] ||= "#{Socket.gethostname}-#{Time.now.iso8601}-#{Process.pid}"
+        OML4R.init(nil, opts)
+      end
+    end
+
+    def closed?
+      false
+    end
+
+    def close
+      # OutputterFactory.create_methods(self)
+      # Logger.log_internal {"Outputter '#{@name}' closed Syslog and set to OFF"}
+    end
+
+    private
+
+    def canonical_log(le)
+      LogEventMP.inject le.level, le.fullname, le.tracer || '', le.data || ''
+    end
+  end
+end
+
+
+if __FILE__ == $0
+  require 'log4r'
+  require 'log4r/configurator'
+  require 'log4r/yamlconfigurator'
+  require 'yaml'
+
+  yf = %{
+log4r:
+
+  # define all loggers ...
+  loggers:
+    - name      : production
+      level     : DEBUG
+      trace     : 'false'
+      outputters:
+        - oml
+  outputters:
+    - name    : oml
+      type    : OmlOutputter
+      collect : file:-
+}
+
+  ycfg = YAML.load yf
+  #puts ycfg['log4r'].inspect
+  ::Log4r::YamlConfigurator.decode_yaml(ycfg['log4r'])
+
+
+
+  log = ::Log4r::Logger['production']
+  log.info 'test'
+  log.debug 'test2'
+
+  log2 = Log4r::Logger.new 'production::foo'
+  log2.debug 'debugging!'
+
+  sleep 2
+
+end

data/lib/oml4r/version.rb

@@ -5,7 +5,7 @@
 # ------------------
 
 module OML4R
-  VERSION = "2.9.1"
+  VERSION = "2.9.3"
   VERSION_STRING = "OML4R Client V#{VERSION}"
   COPYRIGHT = "Copyright 2009-2013, NICTA"
 end

data/lib/oml4r.rb

@@ -36,7 +36,7 @@ module OML4R
   def self.logger=(logger)
     @@logger = logger
   end
-  
+
   class OML4RExeption < Exception; end
   class MissingArgumentException < OML4RExeption; end
   class ArgumentMismatchException < OML4RExeption; end
@@ -76,8 +76,15 @@ module OML4R
     end
 
     # Set a name for this MP
-    def self.name(name)
-      __def__()[:name] = name
+    #
+    # param opts Options
+    # opts add_prefix Add app name as prefix to table. Default: true
+    #
+    def self.name(name, opts = {})
+      if opts[:add_prefix].nil?
+        opts[:add_prefix] = true
+      end
+      __def__()[:name] = {name: name, opts: opts}
     end
 
     # Set the channel these measurements should be sent out on.
@@ -96,7 +103,7 @@ module OML4R
       o = opts.dup
       o[:name] = name
       o[:type] ||= :string
-      case o[:type] 
+      case o[:type]
       when :long
         OML4R.logger.warn ":long is deprecated use, :int32 instead"
         o[:type] = :int32
@@ -194,10 +201,11 @@ module OML4R
       defs = __def__()
 
       # Do some sanity checks...
-      unless (mp_name = defs[:name])
+      unless (mp_name_def = defs[:name])
         raise MissingArgumentException.new "Missing 'name' declaration for '#{self}'"
       end
-      unless (name_prefix.nil?)
+      mp_name = mp_name_def[:name]
+      if !name_prefix.nil? && mp_name_def[:opts][:add_prefix]
         mp_name = "#{name_prefix}_#{mp_name}"
       end
 
@@ -227,14 +235,14 @@ module OML4R
     OML4R#{VERSION_STRING} [#{COPYRIGHT}")
 
     if d = (ENV['OML_EXP_ID'] || opts[:expID])
-      # XXX: It is still too early to complain about that. We need to be sure
+      # NOTE: It is still too early to complain about that. We need to be sure
       # of the nomenclature before making user-visible changes.
       OML4R.logger.warn "opts[:expID] and ENV['OML_EXP_ID'] are getting deprecated; please use opts[:domain] or ENV['OML_DOMAIN']  instead"
       opts[:domain] ||= d
     end
     domain ||= ENV['OML_DOMAIN'] || opts[:domain]
 
-    # XXX: Same as above; here, though, :id might actually be the way to go; or
+    # TODO: Same as above; here, though, :id might actually be the way to go; or
     # perhaps instId?
     #if opts[:id]
     #  raise 'OML4R: :id is not a valid option. Do you mean :nodeID?'
@@ -257,75 +265,80 @@ module OML4R
     omlCollectUri = ENV['OML_COLLECT'] || ENV['OML_SERVER'] || opts[:collect] || opts[:omlServer]
     noop = opts[:noop] || false
 
-
-    # Create a new Parser for the command line
-    op = OptionParser.new
-    # Include the definition of application's specific arguments
-    yield(op) if block
-    # Include the definition of OML specific arguments
-    op.on("--oml-id id", "Name to identify this app instance [#{nodeID || 'undefined'}]") { |name| nodeID = name }
-    op.on("--oml-domain domain", "Name of experimental domain [#{domain || 'undefined'}] *EXPERIMENTAL*") { |name| domain = name }
-    op.on("--oml-collect uri", "URI of server to send measurements to") { |u|  omlCollectUri = u }
-    op.on("--oml-protocol p", "Protocol number [#{OML4R::DEF_PROTOCOL}]") { |l| protocol = l.to_i }
-    op.on("--oml-log-level l", "Log level used (info: 1 .. debug: 0)") { |l| OML4R.logger.level = l.to_i }
-    op.on("--oml-noop", "Do not collect measurements") { noop = true }
-    op.on("--oml-exp-id domain", "Obsolescent equivalent to --oml-domain domain") { |name|
-      domain = name
-      OML4R.logger.warn "Option --oml-exp-id is getting deprecated; please use '--oml-domain #{domain}' instead"
-    }
-    op.on("--oml-file localPath", "Obsolescent equivalent to --oml-collect file:localPath") { |name|
-      omlCollectUri = "file:#{name}"
-      OML4R.logger.warn "Option --oml-file is getting deprecated; please use '--oml-collect #{omlCollectUri}' instead"
-    }
-    op.on("--oml-server uri", "Obsolescent equivalent to --oml-collect uri") {|u|
-      omlCollectUri = u
-      OML4R.logger.warn "Option --oml-server is getting deprecated; please use '--oml-collect #{omlCollectUri}' instead"
-    }
-    op.on_tail("--oml-help", "Show this message") { $stderr.puts op; exit }
-    # XXX: This should be set by the application writer, not the command line
-    #op.on("--oml-appid APPID", "Application ID for OML [#{appName || 'undefined'}] *EXPERIMENTAL*") { |name| appID = name }
-
-    # Now parse the command line
-    OML4R.logger.debug "ARGV:>>> #{argv.inspect}"
-    rest = op.parse(argv)
-    return if noop
+    if argv
+      # Create a new Parser for the command line
+      op = OptionParser.new
+      # Include the definition of application's specific arguments
+      yield(op) if block
+      # Include the definition of OML specific arguments
+      op.on("--oml-id id", "Name to identify this app instance [#{nodeID || 'undefined'}]") { |name| nodeID = name }
+      op.on("--oml-domain domain", "Name of experimental domain [#{domain || 'undefined'}] *EXPERIMENTAL*") { |name| domain = name }
+      op.on("--oml-collect uri", "URI of server to send measurements to") { |u|  omlCollectUri = u }
+      op.on("--oml-protocol p", "Protocol number [#{OML4R::DEF_PROTOCOL}]") { |l| protocol = l.to_i }
+      op.on("--oml-log-level l", "Log level used (info: 1 .. debug: 0)") { |l| OML4R.logger.level = l.to_i }
+      op.on("--oml-noop", "Do not collect measurements") { noop = true }
+      op.on("--oml-exp-id domain", "Obsolescent equivalent to --oml-domain domain") { |name|
+        domain = name
+        OML4R.logger.warn "Option --oml-exp-id is getting deprecated; please use '--oml-domain #{domain}' instead"
+      }
+      op.on("--oml-file localPath", "Obsolescent equivalent to --oml-collect file:localPath") { |name|
+        omlCollectUri = "file:#{name}"
+        OML4R.logger.warn "Option --oml-file is getting deprecated; please use '--oml-collect #{omlCollectUri}' instead"
+      }
+      op.on("--oml-server uri", "Obsolescent equivalent to --oml-collect uri") {|u|
+        omlCollectUri = u
+        OML4R.logger.warn "Option --oml-server is getting deprecated; please use '--oml-collect #{omlCollectUri}' instead"
+      }
+      op.on_tail("--oml-help", "Show this message") { $stderr.puts op; exit }
+      # XXX: This should be set by the application writer, not the command line
+      #op.on("--oml-appid APPID", "Application ID for OML [#{appName || 'undefined'}] *EXPERIMENTAL*") { |name| appID = name }
+
+      # Now parse the command line
+      OML4R.logger.debug "ARGV: #{argv.inspect}"
+      rest = op.parse(argv)
+      return if noop
+    end
 
     unless nodeID
       begin
         # Create a default nodeID by concatinating the local hostname with the process ID
         hostname = nil
-        begin 
+        begin
           hostname = Socket.gethostbyname(Socket.gethostname)[0]
-        rescue Exception 
+        rescue Exception
           begin
             hostname = `hostname`
-          rescue Exception; end           
+          rescue Exception; end
         end
         if hostname
           nodeID = "#{hostname}-#{Process.pid}"
         end
       end
       unless nodeID
-        raise MissingArgumentException.new 'OML4R: Missing values for parameter :nodeID (--oml-id)'        
+        raise MissingArgumentException.new 'OML4R: Missing values for parameter :nodeID (--oml-id)'
       end
     end
-    
+
     unless domain && appName
       raise MissingArgumentException.new 'OML4R: Missing values for parameters :domain (--oml-domain), :nodeID (--oml-id), or :appName (in code)!'
     end
 
-    # Set a default collection URI if nothing has been specified
-    omlCollectUri ||= "file:#{appName}_#{nodeID}_#{domain}_#{Time.now.strftime("%Y-%m-%dt%H.%M.%S%z")}"
 
-    create_channel(:default, omlCollectUri) if omlCollectUri
+    unless opts[:create_default_channel] == false
+      # Set a default collection URI if nothing has been specified
+      unless omlCollectUri
+        omlCollectUri = "file:#{appName}_#{nodeID}_#{domain}_#{Time.now.strftime("%Y-%m-%dt%H.%M.%S%z")}"
+        OML4R.logger.info "Collection URI is #{omlCollectUri}"
+      end
+      create_channel(:default, omlCollectUri)
+    end
 
     # Handle the defined Measurement Points
     startTime = Time.now
     Channel.init_all(domain, nodeID, appName, startTime, protocol)
-    OML4R.logger.info "Collection URI is #{omlCollectUri}"
     rest || []
   end
-  
+
   def self.create_channel(name, url)
     Channel.create(name, url)
   end
@@ -348,8 +361,8 @@ module OML4R
   class Channel
     @@channels = {}
     @@default_domain = nil
-    
-    
+
+
 
     def self.create(name, url, domain = :default)
       key = "#{name}:#{domain}"
@@ -359,28 +372,15 @@ module OML4R
         end
         return channel
       end
-      return self._create(key, domain, url)
+      #return self._create(key, domain, url)
+      return @@channels[key] = self.new(url, domain)
     end
 
-    def self._create(key, domain, url)
-      out = _connect(url)
-      @@channels[key] = self.new(url, domain, out)
-    end
+    # def self._create(key, domain, url)
+      # out = _connect(url)
+      # @@channels[key] = self.new(url, domain, out)
+    # end
 
-    def self._connect(url)
-      if url.start_with? 'file:'
-        proto, fname = url.split(':')
-        out = (fname == '-' ? $stdout : File.open(fname, "w+"))
-      elsif url.start_with? 'tcp:'
-        #tcp:norbit.npc.nicta.com.au:3003
-        proto, host, port = url.split(':')
-        port ||= DEF_SERVER_PORT
-        out = TCPSocket.new(host, port)
-      else
-        raise OML4RException.new "OML4R: Unknown transport in server url '#{url}'"
-      end
-      out
-    end
 
     def self.[](name = :default, domain = :default)
       key = "#{name}:#{domain}"
@@ -398,6 +398,10 @@ module OML4R
 
     def self.init_all(domain, nodeID, appName, startTime, protocol)
       @@default_domain = domain
+      @@nodeID = nodeID
+      @@appName = appName
+      @@startTime = startTime
+      @@protocol = protocol
 
       MPBase.__freeze__(appName, startTime)
 
@@ -420,6 +424,14 @@ module OML4R
 
     attr_reader :url
 
+    def url=(url)
+      return if @url == url
+      if @out
+        raise "Can't change channel's URL when it is already connected"
+      end
+      @url = url
+    end
+
     def send_schema(mp_name, pdefs) # defs[:p_def]
       # Build the schema and send it
       @index += 1
@@ -439,6 +451,7 @@ module OML4R
 
     def init(nodeID, appName, startTime, protocol)
       @nodeID, @appName, @startTime, @protocol = nodeID, appName, startTime, protocol
+      @out = _connect(@url)
     end
 
     def close()
@@ -447,10 +460,9 @@ module OML4R
     end
 
     protected
-    def initialize(url, domain, out_channel)
+    def initialize(url, domain)
       @domain = domain
       @url = url
-      @out = out_channel
       @index = 0
       @schemas = []
       @header_sent = false
@@ -458,6 +470,21 @@ module OML4R
       start_runner
     end
 
+    def _connect(url)
+      if url.start_with? 'file:'
+        proto, fname = url.split(':')
+        out = (fname == '-' ? $stdout : File.open(fname, "w+"))
+      elsif url.start_with? 'tcp:'
+        #tcp:norbit.npc.nicta.com.au:3003
+        proto, host, port = url.split(':')
+        port ||= DEF_SERVER_PORT
+        out = TCPSocket.new(host, port)
+      else
+        raise OML4RException.new "OML4R: Unknown transport in server url '#{url}'"
+      end
+      @out = out
+    end
+
 
     def _send_protocol_header(stream)
       header = []
@@ -474,10 +501,10 @@ module OML4R
         @schemas.each do |s|
           header << "schema: #{s}"
         end
-        header << ""        
+        header << ""
       when 4
         i = 0
-        header << ""        
+        header << ""
         header << "0\t0\t#{i += 1}\t.\texperiment-id\t#{d}"
         header << "0\t0\t#{i += 1}\t.\tstart_time\t#{@startTime.tv_sec}"
         header << "0\t0\t#{i += 1}\t.\tsender-id\t#{@nodeID}"
@@ -485,7 +512,7 @@ module OML4R
         @schemas.each do |s|
           header << "0\t0\t#{i += 1}\t.\tschema\t#{s}"
         end
-        
+
       else
         raise OML4RException.new "Unsupported protocol #{@protocol}"
       end
@@ -552,23 +579,23 @@ module OML4R
     end
 
   end # Channel
-  
+
   require 'logger'
-  
+
   class Logger < ::Logger
     def format_message(severity, time, progname, message)
       "%5s oml4r: %s\n" % [severity, message]
     end
   end
-  
+
   @@logger = Logger.new(STDERR)
   @@logger.level = ::Logger::INFO
-  
+
   def self.logger
     @@logger
   end
-  
-  
+
+
 end # module OML4R
 
 # vim: sw=2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oml4r
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies: []
 description: ! '["Simple OML client library for Ruby"]'
 email:
@@ -23,12 +23,17 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- examples/oml4r-multiple-channel-example.rb
+- examples/oml4r-neuca-beacon.rb
+- examples/oml4r-orca-beacon.rb
 - examples/oml4r-simple-example.rb
+- examples/oml4r-solar.rb
 - examples/oml4r-wlanconfig.rb
 - examples/oml4r-zabbix.rb
 - examples/test_types.rb
 - lib/oml4r.rb
 - lib/oml4r/benchmark.rb
+- lib/oml4r/log4r/oml_outputter.rb
 - lib/oml4r/version.rb
 - oml4r.gemspec
 homepage: http://oml.mytestbed.net
@@ -52,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ! '["This is a simple client library for OML which does not use liboml2 and