omf_rc_shm 0.1.14 → 0.1.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDIzMzIwYTcxNjEwNzRmNmY5YWYzMGI1OTI3ZjhjY2Y4NWU1ZTIzOA==
+    YTJmMDM5Mjk2NjQ0YmYxNDViNjliYjA0OTA4MDc4OTZkNDRkMTFlZg==
   data.tar.gz: !binary |-
-    NzAwNzljZTBkMjhmZmU0ZjM1MzMxMzVjNjdhMjRmYzE2MTdkZWMxNw==
+    ZjMxN2E3YmJlY2UwZDhiYjc3Y2IxMTNhYTkyNTNkMDQ2ODQyMjdlNA==
 SHA512:
   metadata.gz: !binary |-
-    MDM3N2JkZTBkZjBlMWM3NmQwMDM5ZWM5NTIzMjY0YjRmMjNmNDc4ODI0N2Nm
-    NDg5MmUzZmYwYTg1NDdhN2U0ODFlZmIyMWFkYThmZTQwMTZjYTIxYTgwYTZh
-    MmIwNTgyOThiZGQyZDgzMzI2ZGVkNmRjZjZmMWI1YWZmMDE2OWY=
+    NWFhMmVhMTJkZjBjODY4YmFkZWMzMTQ0ZDI1NTg1NTQxODYzMGI3NTVjMmRh
+    ODBjODQxMzlkMWI4OTI0MTRkMGEyMTRhNjI4YTNhNGE5NGUyN2VmODY0MDk3
+    Yjc0ODc1ZGZkNDI5Yjk2NTQ4ZDI5NTUyNjhlYzU3MWRkZDhjNjg=
   data.tar.gz: !binary |-
-    YjI3MTc0ZjBiOGI3OTA1ZGViNmYyODVkNGI1OTA2YzY2YWNhM2QyMjViODE0
-    MWI1ZjFiOGE4MGZiOTY3MWZhYTk3OGYzMmVjOGY2MWQwZTQ1YWQ1YTdjZmFm
-    YzA1NmE5YmQ5YmQ4ZmZjMWRjZTkyOTk0MjZlN2E3Y2UwY2Q2MmI=
+    OTk3MDg3MDcyN2RmM2Q1N2M3OGEyZDdhMjNjMjg5YjY1ZWNjYzcyMzcwZGJh
+    ZGMxZGYxODRlNzMzYzg1NjZjNDA0ZWM4M2ZmMjI2Y2I4ZTdhYTk3YTIzODhh
+    NWRjNGM1ZTFlNDhmMzU5YjA4ZTJkMjViNjFhNzE5OTJhMzkxZDM=

data/lib/omf_rc/resource_proxy/scheduled_application.rb

@@ -288,13 +288,14 @@ module OmfRc::ResourceProxy::ScheduledApplication
       info "Removing cron job for '#{res.property.app_id}'"
       CronEdit::Crontab.Remove res.property.app_id
       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
+      pid_file = "#{res.property.app_log_dir}/#{res.property.app_id}.#{res.uid}.pid.log"
+      begin
+        File.readlines(pid_file).each do |line|
           Process.kill(res.property.timeout_kill_signal, line.to_i)
           info "Killing process #{line.to_i}"
-        rescue Errno::ESRCH
         end
+      rescue Exception => e
+        warn "Could not kill scheduled app #{res.property.app_id}.#{res.uid}"
       end
       res.property.file_change_listener.stop
       res.property.state = :unscheduled
@@ -320,7 +321,9 @@ module OmfRc::ResourceProxy::ScheduledApplication
         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 *")
+          cron_schedule = t.strftime("%-M %-H %-d %-m *")
+        else
+          cron_schedule = res.property.schedule
         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}.#{res.uid}.err.log"
@@ -335,9 +338,9 @@ module OmfRc::ResourceProxy::ScheduledApplication
         cmd = "#{app_wrapper_path} #{stdout_file} #{stderr_file} #{pid_file} #{res.property.timeout} #{res.property.timeout_kill_signal} #{res.build_command_line}"
         cmd = "#{res.property.ruby_path} #{cmd}" if res.property.ruby_path
 
-        info "Adding cron job for '#{res.property.app_id}' with schedule '#{res.property.schedule}' and command '#{cmd}'"
+        info "Adding cron job for '#{res.property.app_id}' with schedule '#{cron_schedule}' and command '#{cmd}'"
 
-        CronEdit::Crontab.Add res.property.app_id, "#{res.property.schedule} #{cmd}"
+        CronEdit::Crontab.Add res.property.app_id, "#{cron_schedule} #{cmd}"
         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|

data/lib/omf_rc/resource_proxy/shm_node.rb

@@ -17,11 +17,13 @@ module OmfRc::ResourceProxy::ShmNode
   hook :after_initial_configured do |node|
     unless node.request_app_definition_file.nil?
       OmfRcShm.app.load_definition(node.request_app_definition_file)
-      info "Using app definition from '#{node.request_app_definition_file}'"
+      info "Loaded scheduled app definition from '#{node.request_app_definition_file}'"
+      info "Setting default membership to '#{OmfRcShm.app.default_groups}'"
       OmfRcShm.app.definitions.each do |name, app_opts|
         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)
+        opts = app_opts.properties.merge(hrn: name, ruby_path: node.property.ruby_path, 
+                                         parent_id: node.uid, membership: OmfRcShm.app.default_groups)
+        s_app = node.create(:scheduled_application, opts)
         OmfCommon.el.after(5) { s_app.configure_state(:scheduled) }
       end
     end

data/lib/omf_rc_shm/app/dsl.rb

@@ -8,6 +8,9 @@ class App
       info "Adding new definition #{name}"
       block.call(app_def) if block
     end
+    def defDefaultGroup(name)
+      OmfRcShm.app.default_groups << name
+    end
   end
 end
 end

data/lib/omf_rc_shm/app.rb

@@ -9,12 +9,14 @@ module OmfRcShm
 
     attr_accessor :definitions
     attr_accessor :watchdog
+    attr_accessor :default_groups
 
 
     def initialize
       super
       @definitions ||= Hash.new
       @watchdog = nil
+      @default_groups = []
     end
 
     def load_definition(file_path)

data/lib/omf_rc_shm/version.rb

@@ -1,3 +1,3 @@
 module OmfRcShm
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

data/omf_rc_shm.gemspec

@@ -19,7 +19,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 "omf_rc" , "~> 6.1" 
   spec.add_runtime_dependency "json-jwt"
   spec.add_runtime_dependency "cronedit"
   spec.add_runtime_dependency "listen", "~> 1.3.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omf_rc_shm
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-27 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.5
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 6.0.5
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: json-jwt
   requirement: !ruby/object:Gem::Requirement
@@ -147,4 +147,3 @@ summary: OMF resource proxy extension for SHM project
 test_files:
 - test/scheduled_app_controller.rb
 - test/scheduled_app_tester.rb
-has_rdoc: