omf_rc_shm 0.0.1 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTM4MTc2MWI2YzI4ZTQ1NTVhYjJkNmY1ZWRjOWM2MWNkMTJhNmI5Yg==
+    MGVlZDhmOTQ2NzU5MWZhOTg0ODQ0MjAyMmVkODU0Mzg0ZDY3YmUyMA==
   data.tar.gz: !binary |-
-    MWNiMDIzYWEzZDlmMmU2M2UzYTZlMjYwZjZjZjkxZGFiN2FmNDk4NQ==
+    OGE1NmNkOWJmMDFjMGNhOWMxNWU1ZGY3YmIyYTZjODE4NmQxNzQwYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODNkZWU1YWEwYzk0NTIxMTJiMjFmZTg0NDY5Y2M0MWM0Mjk0N2U0NWVkOWM3
-    MDYxNmRhNTFkYmZkYmJlYzljM2RjZTQyODk2NWJhYmNhZjJlZGJlZDQ5MmFm
-    OWQ5MThkNGZlNWFhNzNkNjc4ODZhNjllNmFkODU3OTI3YWM1ZjE=
+    MjQwYWVkNjUwYzVlMWUwNTM3NTVkNzhlYzJjNDNiMjIxNWFjOTZkMmRhYTY2
+    MTg1Mjg2NzI0MWZhODVlNjU4MjAwNjQ3ZWNkYjViNjg2NTllM2RlOGFhZjYw
+    ZjAzYjA3ZjEwMGI4ZjgwNGUxNzUwNDUxYjlhZmYyODUyMTNiOTI=
   data.tar.gz: !binary |-
-    NGVmNjY1ZTcxOTkzMzE1ZWJmZjAxZDgxNzg3YWUyNzljOWM5MDM2YTY2YTVl
-    MjA2YmRiMjQ1NDlhNTEyYjMyNTcxNzIzM2Y4ZGQyMzQzN2VjZTFlYTRjNzEx
-    NjFlMDZjNDIwNWRiMmRkZjU3ODhiNWRiMWQwYTgxNGI0ZTA5ZjQ=
+    YTE2MTMxYTgzMmNhMzdiNDZjOTc4YmQ0NzFmNzQ3Y2NkNjAyODczNmEzMjQ4
+    NzdjOGMzODY4YWQzZmIxOGI5YzYzMDljOTYzODZkMGE4NjIzNTJmY2QxMzEw
+    NDFhNWZjYmY0OGI0ZmE4MmJhYmUyYjNhZTBjMTBjNDk1M2EyNjY=

data/lib/omf_rc/resource_proxy/scheduled_application.rb

@@ -96,7 +96,7 @@ module OmfRc::ResourceProxy::ScheduledApplication
   property :oml, :default => Hashie::Mash.new
   property :oml_logfile, :default => nil
   property :oml_loglevel, :default => nil
-  property :schedule, :default => nil
+  property :schedule, :default => "now"
   property :timeout, :default => 0
   property :timeout_kill_signal, :default => 'TERM'
   property :file_change_listener, :default => nil
@@ -304,15 +304,32 @@ 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
+          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)
         stderr_file = "#{res.property.app_log_dir}/#{res.property.app_id}.err.log"
         stdout_file = "#{res.property.app_log_dir}/#{res.property.app_id}.out.log"
+        pid_file = "#{res.property.app_log_dir}/#{res.property.app_id}.pid.log"
         File.delete(stderr_file) if File.exist?(stderr_file)
         File.delete(stdout_file) if File.exist?(stdout_file)
-        cmd = "#{res.build_command_line} 2>>#{stderr_file} 1>>#{stdout_file} ; echo \"Application '#{res.property.app_id}' exited with code $? \" >>#{stderr_file}"
-        if res.property.timeout > 0
-          cmd = "timeout -s #{res.property.timeout_kill_signal} #{res.property.timeout} #{cmd}"
-        end
+        File.delete(pid_file) if File.exist?(pid_file)
+        #cmd = "#{res.build_command_line} 2>>#{stderr_file} 1>>#{stdout_file}; echo \"Application exited with code: $? \" >>#{stderr_file}"
+        cmd = "ruby -e 'pid = spawn(\"#{res.build_command_line}\", :out=>[\"#{stdout_file}\", \"a\"], :err=>[\"#{stderr_file}\", \"a\"])
+`echo \#{pid} >> #{pid_file}`
+fork {
+  sleep #{res.property.timeout}
+  Process.kill(\"#{res.property.timeout_kill_signal}\", pid)
+} if #{res.property.timeout} > 0
+Process.waitpid(pid)
+`echo Process \#{pid} exited with code: \#{$?.exitstatus} >> #{stderr_file}`'"
+        cmd.gsub!(/[\n]+/, ";");
+        # cmd = "#{res.build_command_line} 2>>#{stderr_file} 1>>#{stdout_file};"
+        # if res.property.timeout > 0
+        #   cmd = "timeout -s #{res.property.timeout_kill_signal} #{res.property.timeout} #{cmd}"
+        # end
         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}"
 #        ExecApp.new(res.property.app_id,
@@ -332,7 +349,17 @@ module OmfRc::ResourceProxy::ScheduledApplication
               data = IO.read(file,nil,res.property.file_read_offset[file])
               res.property.file_read_offset[file]+=data.length
               data.split(/\r?\n/).each do |line|
-                event_type = (file.include? ".err.log") ? "STDERR" : "STDOUT"
+                event_type = "STDOUT"
+                if file.include? ".err.log"
+                  event_type = "STDERR"
+                  if line.include? "exited with code:"
+                    if line.split(":").last.to_i == 0
+                      event_type = "DONE.OK"
+                    else
+                      event_type = "DONE.ERROR"
+                    end
+                  end
+                end
                 res.process_event(res, event_type, res.property.app_id, line)
               end
             end

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.0.1"
+  VERSION = "0.1.1"
 end

data/omf_rc_shm.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_runtime_dependency "omf_rc", "~> 6.0.5"
+  spec.add_runtime_dependency "json-jwt"
   spec.add_runtime_dependency "cronedit"
   spec.add_runtime_dependency "listen"
 end

data/test/scheduled_app_tester.rb

@@ -19,10 +19,11 @@ def run_test(app)
   end
 
   # Configure the 'binary_path' and 'parameters' properties of the App Proxy
-  app.configure(binary_path: "date",
+  app.configure(binary_path: "sleep 5",
                 oml_configfile: "/Users/cdw/tempo/omf_rc_shm/README.md",
+                timeout: 3,
 #                use_oml: true,
-                schedule: "* * * * *")
+                schedule: "now")
 
   # Start the application 2 seconds later
   OmfCommon.eventloop.after 1 do
@@ -30,7 +31,7 @@ def run_test(app)
   end
 
   # Stop the application another 10 seconds later
-  OmfCommon.eventloop.after 120 do
+  OmfCommon.eventloop.after 200 do
     app.configure(state: :unscheduled)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - NICTA
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 6.0.5
+- !ruby/object:Gem::Dependency
+  name: json-jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cronedit
   requirement: !ruby/object:Gem::Requirement