omf_ec 6.1.3.pre.1 → 6.1.3.pre.2

data/example/config/logging_to_oml.yml

@@ -0,0 +1,36 @@
+communication:
+  url: amqp://localhost
+
+# This setup will silent STDOUT,
+# send info messages to OML SERVER,
+# and everything to ROLLING LOG FILES
+#
+# In this example, these setting are identical to EC default
+logging:
+  level:
+    default: debug
+  appenders:
+    # Turn off STDOUT
+    stdout:
+      level: :info
+    # To Rolling log file, and log everything
+    rolling_file:
+      level: all
+      log_dir: /var/tmp
+      # max 50mb of each log file
+      size: 52428800
+      # keep a 5 logs in total
+      keep: 5
+      date_pattern: "%F %T %z"
+      pattern: "[%d] %-5l %c: %m\n"
+    # To OML is enabled by default when oml_uri option is SET
+    # Uncomment this if you need to change the default
+    #
+    # oml4r:
+    #   level: info
+    #   appName: 'omf_ec'
+    #   domain: '<%= OmfEc.experiment.id %>'
+    #   collect: tcp:some_other_oml_server:3003
+
+# Use OML server located at localhost port 3003
+oml_uri: tcp:localhost:3003

data/example/config/with_custom_logging.yml

@@ -13,7 +13,8 @@ logging:
       level: info
       date_pattern: "%H:%M:%S"
       pattern: "%d %5l %c{2}: %m\n"
-      color_schema: default
+      # To turn colour on use color_scheme: default
+      color_scheme: none
     # To Rolling log file, and log everything
     rolling_file:
       level: all

data/lib/omf_ec/runner.rb

@@ -40,7 +40,7 @@ module OmfEc
               keep: 5, # keep a 5 logs in total
               date_pattern: '%F %T %z',
               pattern: '[%d] %-5l %c: %m\n'
-            },
+            }
           }
         }
       )
@@ -93,6 +93,7 @@ module OmfEc
 
           op.on("--name", "--experiment EXPERIMENT_NAME", "Experiment name") do |e_name|
             @cmd_opts[:experiment_name] = e_name
+            OmfEc.experiment.name = e_name
             remove_cmd_opts_from_argv("--name", "--experiment", e_name)
           end
 
@@ -157,13 +158,25 @@ module OmfEc
       uri = @cmd_opts.delete(:uri)
       @config_opts[:communication][:url] = uri if uri
       @config_opts[:communication][:auth] = { authenticate: true } if @cmd_opts[:cert]
+
+
       @config_opts.merge!(@cmd_opts)
+
+      if @config_opts[:oml_uri]
+        # Only change default if they are not set in config file
+        @config_opts[:logging][:appenders][:oml4r] ||= {
+          level: :info,
+          appName: 'omf_ec',
+          domain: OmfEc.experiment.id,
+          collect: @config_opts[:oml_uri]
+        }
+      end
     end
 
     def parse_config_file
       if (config_file = @cmd_opts.delete(:config_file))
         if File.exist?(config_file)
-          @config_opts.merge!(OmfCommon.load_yaml(config_file))
+          @config_opts.merge!(OmfCommon.load_yaml(config_file, erb_process: true))
         else
           puts "Config file '#{config_file}' doesn't exist"
           exit(1)
@@ -176,7 +189,6 @@ module OmfEc
     end
 
     def setup_experiment
-      OmfEc.experiment.name = @config_opts[:experiment_name] if @config_opts[:experiment_name]
       OmfEc.experiment.oml_uri = @config_opts[:oml_uri] if @config_opts[:oml_uri]
       OmfEc.experiment.show_graph = @config_opts['show-graph']
 
@@ -242,11 +254,6 @@ module OmfEc
       else
         Logging.consolidate 'OmfCommon', 'OmfRc'
       end
-
-      if OmfEc.experiment.oml_uri
-        require 'oml4r/logging/oml4r_appender'
-        Logging.logger.root.add_appenders(Logging.appenders.oml4r('oml4r', :appName => 'omf_ec', :domain => "#{OmfEc.experiment.id}", :collect => "#{OmfEc.experiment.oml_uri}"))
-      end
     end
 
     def load_experiment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_ec
 version: !ruby/object:Gem::Version
-  version: 6.1.3.pre.1
+  version: 6.1.3.pre.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.pre.1
+        version: 6.1.3.pre.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.1.3.pre.1
+        version: 6.1.3.pre.2
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +137,7 @@ files:
 - Rakefile
 - bin/omf_ec
 - example/config/default.yml
+- example/config/logging_to_oml.yml
 - example/config/with_custom_logging.yml
 - example/engine_oedl.rb
 - example/engine_test.rb