omf_rc_shm 0.1.8 → 0.1.9

data/README.md

@@ -51,7 +51,8 @@ Example:
       a.schedule = "*/5 * * * *"
       a.timeout = 20
       a.parameters = {
-        udp_target_host: { cmd: "--udp-target", value: "0.0.0.0", mandatory: true }
+        udp_target_host: { cmd: "--udp-target", value: "0.0.0.0", mandatory: true },
+        udp_target_port: { cmd: "--udp-port", value: 5000, mandatory: true }
       }
       a.use_oml = true
       a.oml = {
@@ -61,9 +62,8 @@ Example:
           {
             url: "tcp:0.0.0.0:3003",
             streams: [
-              {
-                mp: "udp_in", samples: 1
-              }
+              { mp: "udp_in", samples: 1 },
+              { mp: "udp_out", samples: 1 }
             ]
           }
         ]
@@ -73,7 +73,7 @@ Example:
 Where
 
  * `binary_path` is local path to the application's binary
- * `schedule` is the definition of the schedule to run the application on. It can be either the string 'now' (= run this application as soon as possible) or a cron-type formatted schedule (see [crontab manual](http://www.google.com/search?q=man+crontab))
+ * `schedule` is the definition of the schedule to run the application on. It can be either the string 'in X' which means that the application will be started X minutes after its definition has been processed; or a cron-type formatted schedule (see [crontab manual](http://www.google.com/search?q=man+crontab))
  * `timeout` the time in second after which the application should be stopped, set to 0 to let the application stop by itself
  * `parameters` the list of command line parameters that this application accepts, see the [OMF Documentation](https://github.com/mytestbed/omf/blob/master/doc/APPLICATION_PROXY.mkd#parameter-properties) for more detail
  * `use_oml` enable OML instrumentation

data/config/scheduled_app.rb

@@ -3,7 +3,8 @@ defApplication("my_app_name") do |a|
   a.schedule = "*/5 * * * *"
   a.timeout = 20
   a.parameters = {
-    udp_target_host: { cmd: "--udp-target", value: "0.0.0.0", mandatory: true }
+    udp_target_host: { cmd: "--udp-target", value: "0.0.0.0", mandatory: true },
+    udp_target_port: { cmd: "--udp-port", value: 5000, mandatory: true }
   }
   a.use_oml = true
   a.oml = {
@@ -13,11 +14,10 @@ defApplication("my_app_name") do |a|
       {
         url: "tcp:0.0.0.0:3003",
         streams: [
-          {
-            mp: "udp_in", samples: 1
-          }
+          { mp: "udp_in", samples: 1 },
+          { mp: "udp_out", samples: 1 }
         ]
       }
     ]
   }
-end
+end

data/lib/omf_rc/resource_proxy/scheduled_application.rb

@@ -97,7 +97,7 @@ module OmfRc::ResourceProxy::ScheduledApplication
   property :oml, :default => Hashie::Mash.new
   property :oml_logfile, :default => nil
   property :oml_loglevel, :default => nil
-  property :schedule, :default => 'now'
+  property :schedule, :default => 'in 2'
   property :timeout, :default => 0
   property :timeout_kill_signal, :default => 'TERM'
   property :file_change_listener, :default => nil
@@ -287,7 +287,7 @@ module OmfRc::ResourceProxy::ScheduledApplication
     if res.property.state == :scheduled
       info "Removing cron job for '#{res.property.app_id}'"
       CronEdit::Crontab.Remove res.property.app_id
-      restart_cron = `/etc/init.d/cron restart` # Vixie Cron on Angstrom requires restart!
+      restart_cron = `/etc/init.d/cron restart &>/dev/null` # Vixie Cron on Angstrom requires restart!
       pid_file = "#{res.property.app_log_dir}/#{res.property.app_id}.pid.log"
       File.readlines(pid_file).each do |line|
         begin
@@ -316,9 +316,10 @@ module OmfRc::ResourceProxy::ScheduledApplication
       elsif res.property.schedule.nil?
         res.log_inform_warn "No schedule given!"
       else
-        # "now" schedules job to run once, two minutes from now
-        if res.property.schedule == "now"
-          t = Time.now()+120
+        # "in X" schedules job to run once, X minutes from now
+        if res.property.schedule[0,3] == "in "
+          delay = res.property.schedule.split(' ')[1].to_i * 60
+          t = Time.now() + delay
           res.property.schedule = t.strftime("%-M %-H %-d %-m *")
         end
         Dir.mkdir(res.property.app_log_dir) if !Dir.exist?(res.property.app_log_dir)
@@ -337,7 +338,7 @@ module OmfRc::ResourceProxy::ScheduledApplication
         info "Adding cron job for '#{res.property.app_id}' with schedule '#{res.property.schedule}' and command '#{cmd}'"
 
         CronEdit::Crontab.Add res.property.app_id, "#{res.property.schedule} #{cmd}"
-        restart_cron = `/etc/init.d/cron restart` # Vixie Cron on Angstrom requires restart!
+        restart_cron = `/etc/init.d/cron restart &>/dev/null` # Vixie Cron on Angstrom requires restart!
         res.property.file_change_callback = Proc.new do |modified, added, removed|
           removed.each do |file|
             res.property.file_read_offset[file]=nil

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -17,8 +17,9 @@ module OmfRc::ResourceProxy::ShmNode
   hook :after_initial_configured do |node|
     OmfRcShm.app.load_definition(node.request_app_definition_file)
 
+    info "Using app definition from '#{node.request_app_definition_file}'"
     OmfRcShm.app.definitions.each do |name, app_opts|
-      info "Got definition #{app_opts.inspect}, now schedule them..."
+      info "Got definition #{app_opts.inspect}, now schedule it..."
       opts = app_opts.properties.merge(hrn: name, ruby_path: node.property.ruby_path, parent_id: node.uid)
       s_app = OmfRc::ResourceFactory.create(:scheduled_application, opts)
       OmfCommon.el.after(5) do

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/test/scheduled_app_tester.rb

@@ -23,7 +23,7 @@ def run_test(app)
 #                oml_configfile: "/some/file",
                 timeout: 3,
 #                use_oml: true,
-                schedule: "* * * * *") # or use "now"
+                schedule: "* * * * *") # or use "in 1"
 
   # Start the application 2 seconds later
   OmfCommon.eventloop.after 1 do

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
+  prerelease: 
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_rc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cronedit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -123,27 +136,29 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OMF resource proxy extension for SHM project
 test_files:
 - test/scheduled_app_controller.rb
 - test/scheduled_app_tester.rb
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmNiYWI3NTM2N2I0ZGRiMDNhZDc2MTY2ODM2MzM5ZTQ0YjgxMDBlMA==
-  data.tar.gz: !binary |-
-    MWMzN2M1OWQyNzJlOGE3NGNmNDVhMWI1YWE5NWM1NGU4YmU4MWM3Ng==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ZmY2ZjdhZjhmNTVlNTg0Y2QzMzVjZTFiMGY3NDBmODY3MTk3N2Y4NzNjMjU4
-    ZWMwZmIxYTQzZjU4ODkyNTI4OGZmZmZlMGJhMmFiNDJiZjMxYWE2MDMwMDBj
-    YmUxYWU0M2E3OGFhZTQ3MjM4ZDgyODBmNjc1ZWNhZjVkMDFhNDQ=
-  data.tar.gz: !binary |-
-    MWQ4NjJhYzU5ODBjNDE4MWVkNjQ1NDRlNmM2NDBjMDdlNDM0NDlhOTY1YTQ1
-    OTFhYTg3YWZmODYwNDIxYmI5NWQ4OTNkZjZiNmNhOTljNmRjM2Q5MDk3ODRk
-    ZTM3OGE2YzYzMWIxN2M2OTMyMjk3Yjg4YTlkNDhlMmY0MDJmMWI=