omf_rc_shm 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWI4OGY2NmNkZDk0ZjFkYzA5NTUyNzA4MzZkYWFmMzUxNjMzMjc0NA==
+    MWI0MmIwNjMzMWJjMDA3OGJmMWQ1MTZlYWZkZmRkYTcxNjEzNjk3MQ==
   data.tar.gz: !binary |-
-    M2ZjMGIzNzQ4OWEyY2Y1NTlkNGRkNTY5NjJjYjAxMTI3NDA2MjFkZQ==
+    MWJlYjQ3MzFhMWE5ZWIyNGJhMWQzZDAwNzQ3YmNiMDJjMTBhZDkxMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTlmZGQ3YWVkZmVkZmExODc2YzI2NzI2ODYwM2ZmZjZkOWQwMjdhZjNhNzEy
-    OWNhY2E4NDM3ZTNiZjIxNDVjOTdjYTMyMGFkNTUxMjNiOTM3ZGRiMWMzZGVi
-    MjQ1YTgxYjhjYTYxMWY5NzkxYTAwYmE5N2YyODk0YWNiZTI3OTA=
+    MjEyMzM2NDllODM3ZWE3NzZjMjAxYTZkOWM2YWQ2NzY1ZDM0NGY2N2M3MDI4
+    NWY2NmE1NGM1YzcxYmMyMGI1NTk5Y2QwNDhhZWU2ZWQ0ZTQzOGQ5Y2ZkMmFj
+    ZmVlYTMzYTI1OWM3MGRlYWQwMDNjNDQxODFjYmI2Mjc2MjEwODg=
   data.tar.gz: !binary |-
-    Y2Y5M2U2ZGNiOWIwZjUzNTRjNjJjZTMwZjhhNmQ2NDgxZGZlNzkyNWQzZWE1
-    Zjk3MGEzYmYyNDljN2MzYTNlNzg4NGMwODNiNjgxNDczZDhlNDRiYjYxMjAz
-    ZDlhY2IyM2I0ZWE4ODhlMDljNDlmMDZhNTgzNDQ5MGM0MDA0MTM=
+    YTdhZWNmY2JjZmE3ZjRkMjA2MzI4YTYyNzk3NzhmYTIzYzdiNWI3YzM2MWY1
+    NzEyYmUwNTA4Njk0ZjQ4MTgxYTc1MDY0ODJlNTcyZTQ1Mzc1ODY3NmMzODI0
+    NmNjYTY5YTg1MGNiNzBlNTllZDI2NDc3MmU0NTRhYzljNWI1MTg=

data/bin/cronjob_app_wrapper

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+cmd, stdout_f, stderr_f, pid_f, timeout, kill_sig = *ARGV
+
+pid = Process.spawn(cmd, out: [stdout_f, "a"], err: [stderr_f, "a"])
+
+`echo #{pid} >> #{pid_f}`
+
+if timeout && timeout.to_i > 0
+  fork do
+    sleep timeout.to_i
+    Process.kill(kill_sig, pid)
+  end
+end
+
+Process.waitpid(pid)
+
+`echo Process #{pid} exited with code: #{$?.exitstatus} >> #{stderr_f}`
+

data/config/test.rb

@@ -1,39 +1,25 @@
-App.define(
-  "otr2", {
-    schedule: "* * * * *",
-    timeout: 20,
-    binary_path: "/usr/bin/otr2",
-    use_oml: true,
-    parameters: {
-      udp_local_host: { cmd: "--udp:local_host", value: "0.0.0.0" }
-    },
-    oml: {
-      experiment: "otr2_#{Time.now.to_i}",
-      id: "otr2",
-      available_mps: [
-        {
-          mp: "udp_in",
-          fields: [
-            { field: "flow_id", type: :long },
-            { field: "seq_no", type: :long },
-            { field: "pkt_length", type: :long },
-            { field: "dst_host", type: :string },
-            { field: "dst_port", type: :long }
-          ]
-        }
-      ],
-      collection: [
-        {
-          url: "tcp:0.0.0.0:3003",
-          streams: [
-            {
-              mp: "udp_in",
-              interval: 3
-            }
-          ]
-        }
-      ]
-    }
+defApplication("otr2") do |a|
+  a.schedule = "* * * * *"
+  a.timeout = 20
+  a.binary_path = "/usr/bin/otr2"
+  a.use_oml = true
+  a.parameters = {
+    udp_local_host: { cmd: "--udp:local_host", value: "0.0.0.0" }
   }
-)
+  a.oml = {
+    experiment: "otr2_#{Time.now.to_i}",
+    id: "otr2",
+    collection: [
+      {
+        url: "tcp:0.0.0.0:3003",
+        streams: [
+          {
+            mp: "udp_in",
+            interval: 3
+          }
+        ]
+      }
+    ]
+  }
+end
 

data/lib/omf_rc/resource_proxy/scheduled_application.rb

@@ -324,17 +324,13 @@ module OmfRc::ResourceProxy::ScheduledApplication
         File.delete(stderr_file) if File.exist?(stderr_file)
         File.delete(stdout_file) if File.exist?(stdout_file)
         File.delete(pid_file) if File.exist?(pid_file)
-        cmd = "ruby -e 'extend Process
-pid = spawn(\"#{res.build_command_line}\", :out=>[\"#{stdout_file}\", \"a\"], :err=>[\"#{stderr_file}\", \"a\"])
-`echo \#{pid} >> #{pid_file}`
-fork {
-  sleep #{res.property.timeout}
-  kill(\"#{res.property.timeout_kill_signal}\", pid)
-} if #{res.property.timeout} > 0
-waitpid(pid)
-`echo Process \#{pid} exited with code: \#{$?.exitstatus} >> #{stderr_file}`'"
-        cmd.gsub!(/[\n]+/, ";") # make it a one-liner
+
+        app_wrapper_path = File.expand_path("#{File.dirname(__FILE__)}/../../../bin/cronjob_app_wrapper")
+
+        cmd = "#{app_wrapper_path} #{res.build_command_line} #{stdout_file} #{stderr_file} #{pid_file} #{res.property.timeout} #{res.property.timeout_kill_signal}"
+
         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}"
         res.property.file_change_callback = Proc.new do |modified, added, removed|
           removed.each do |file|
@@ -431,7 +427,9 @@ waitpid(pid)
   # @return [String] the full command line
   # @!macro work
   work('build_command_line') do |res|
-    cmd_line = "env -i " # Start with a 'clean' environment
+    # TODO is this necessary?
+    #cmd_line = "env -i " # Start with a 'clean' environment
+    cmd_line = ""
     res.property.environments.each do |e,v|
       val = v.kind_of?(String) ? "'#{v}'" : v
       cmd_line += "#{e.to_s.upcase}=#{val} "

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -17,9 +17,8 @@ module OmfRc::ResourceProxy::ShmNode
 
     OmfRcShm.app.definitions.each do |name, app_opts|
       info "Got definition #{app_opts.inspect}, now schedule them..."
-      app_opts[:hrn] = name
-
-      s_app = OmfRc::ResourceFactory.create(:scheduled_application, app_opts)
+      opts = app_opts.properties.merge(hrn: name)
+      s_app = OmfRc::ResourceFactory.create(:scheduled_application, opts)
       OmfCommon.el.after(5) do
         s_app.configure_state(:scheduled)
       end

data/lib/omf_rc_shm/app.rb

@@ -17,9 +17,5 @@ module OmfRcShm
     def load_definition(file_path)
       eval(File.read(file_path))
     end
-
-    def self.define(app_name, app_opts)
-      self.instance.definitions[app_name] = app_opts
-    end
   end
 end

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,8 @@ dependencies:
 description: 
 email:
 - omf-user@lists.nicta.com.au
-executables: []
+executables:
+- cronjob_app_wrapper
 extensions: []
 extra_rdoc_files: []
 files:
@@ -106,6 +107,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/cronjob_app_wrapper
 - config/rc.yml.sample
 - config/test.rb
 - lib/omf_rc/resource_proxy/scheduled_application.rb