rsf_services 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e361339add15a027655df802c482cc68865edd
-  data.tar.gz: 94900ad43d1f129a5c24ae546abe05f219bb9329
+  metadata.gz: ccb3d3cac479ccaa32db93d130a891e1d2874dbf
+  data.tar.gz: 8b0aca3a4c9cf9a6d674b880d3a7cdbcba41e96c
 SHA512:
-  metadata.gz: cb676dc1445acfa827919e60ba91a5ca691cbf9ec05f39ad331ac5ab79362e70fd0edf3369c8bfbfe02620ab234bd7ddb4a5751a0cbe8f81dacdbc7fae8acf27
-  data.tar.gz: 2c755829411fa018547128f7eaaa7e3d7f65799b6300b8c7ab606b43d7f1790721746a2217d20dc889fd7f8ff2813fa107326958f25a7738a133f6b9eb6e8678
+  metadata.gz: 98fde9da851adb83368a1ede0e53877a30ae8fe903579cf7a7c4db4ba207ec440d2c0a09af4fa6ebcc55bd1da37ad16a29b069ca91c69c087e333da15f647d03
+  data.tar.gz: f8a16754c8f7a5dee10af5b4572c294f39a4bc085eae53efecc74ed134cf1643a58786883f1847c61ba6c2a0ddc02185d67f20a0e3042cb498894c66f3b200c4

data/lib/rsf_services.rb

@@ -11,27 +11,28 @@ class RSFServices < RScript
 
   attr_reader :services
 
-  def initialize(reg_path='', package_basepath: '', log: nil)
+  def initialize(reg_path='', package_basepath: '', logfile: nil)
+    
+    @log = Logger.new logfile, 'daily' if logfile
 
-    super()
+    super(log: logfile)
 
     @package_basepath, @services = package_basepath, {}
-    @log = log
-    @logger = Logger.new log, 'daily' if log
 
     if reg_path.length > 0 then
 
       @services['registry'] = reg = DWSRegistry.new reg_path
 
       # load the system/startup RSF jobs
+
       jobs = reg.get_keys('system/startup/.[load="1"]').inject({}) do |r, job|
         settings = reg.get_keys("system/packages/#{job.name}/*")\
                           .inject({}){|r,x| r.merge(x.name.to_sym => x.text) }
         r.merge(job.name => settings)
       end
-
+      
       jobs.each do |package, settings| 
-        r = run_job(package.to_s, '//job:load', settings, 
+        r = run_job(package.to_s, 'load', settings, 
                                                 package_path: settings[:url])
       end
     end
@@ -41,30 +42,38 @@ class RSFServices < RScript
   def run_job(package, jobs, params={}, *qargs, 
                   package_path: ("%s/%s.rsf" % [@package_basepath, package]))
 
-    yield(params) if block_given?
-    result, args = read([package_path, jobs.split(/\s/),qargs].flatten)
+    log 'inside run job' + ("package: %s jobs: %s params: %s qargs: %s package_path: %s" % [package, jobs, params, qargs, package_path])
+    yield(params) if block_given?    
+    
+    a = [package_path, jobs.split(/\s/).map{|x| "//job:%s" % x} ,qargs].flatten
+    result, args = read(a)
 
     rws = self
-    
+
     begin
+      
+      log 'result : ' +  result
 
       r = eval result
+      
+      log  'r : ' + r.inspect
       return r
 
     rescue Exception => e  
       params = {}
       err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")      
+      log 'err_label : ' + err_label.inspect
       log(err_label)
     end
-
+    
   end
 
   private
 
   def log(msg)
-    if @log == true then
-      @logger.debug msg
-    end
+
+    @log.debug msg if @log
+
   end
     
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsf_services
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,28 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDmDCCAoCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBJMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjETMBEGCgmSJomT
-  8ixkARkWA2V1XzAeFw0xNDA3MTIxOTQwMTlaFw0xNTA3MTIxOTQwMTlaMEkxEjAQ
-  BgNVBAMMCWdlbW1hc3RlcjEeMBwGCgmSJomT8ixkARkWDmphbWVzcm9iZXJ0c29u
-  MRMwEQYKCZImiZPyLGQBGRYDZXVfMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-  CgKCAQEA1DClU6Pd/0b4nvq/x5LFVUImRhnj6C/6fdSBcdyFObJOH8C5i6Mllr/G
-  eRykF+Qvh1ZFi+RjrxecMIN5rZ5A6QIxqEhlLM2SQKOf4vIdqjrGQIcHeD8fsk/N
-  djPLrfiX2OHYRQrsj4bAlMTQVTy70gK8I3+NOUpePyzYe52KX0Vde/xD+stvupCb
-  CmswhWsbjFJGrQusFr5QFmJMgtPoxqWyNtkhPiqsM5eqp3r9ZJAD2veSqox9rq/Z
-  dVRHwQG9DvVXyqveXqvb545X2Ef0+Nw9uNBDEJfSUvmFwT/q/l5Ps+7ydj+ansxx
-  IhheD5wkWMOs/NkuUVas1wMMmOGrzQIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBQFiNJVQtZNj1IoNIOz+GzxFRjJ8DAmBgNVHREE
-  HzAdgRtnZW1tYXN0ZXJAamFtZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2Vt
-  bWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAq6pKR
-  Wx9Y5UDCEmxphcNgT90e9gR5B1zxSktEF1GO9WtrG/J/Eb6G48tweJKe1nrib4La
-  Zx3+vHIDj7FguCB1fQgQx/pkx64kW+CZOzWtLOrsJiqKrme7/nak9TZyBy2BF5K2
-  oCTU2uxFT74h6FmPLlrDR206F04F4HaFzJKNMKG7cDhanQs5hsuXFAEQdD6DWJik
-  awGab/qAohwrAtP/MCNls9YNFvBWWDPozQ0WZlCe8zXjoTAtDpYUVBznhuWkdPpC
-  FpnFf8SgVEggA3UJApMkdLJgylaFVRWB9YefdTYWcBgpvwnI5hrcpw06jXRmazk5
-  JTUarTGO425WKYWE
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
+  8ixkARkWAmV1MB4XDTE2MDExNDIxNDM0NFoXDTE3MDExMzIxNDM0NFowSDESMBAG
+  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
+  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+  ggEBAMFISA5WF7jU3Qnw5RoDh+utpZB5mvdVW+Eai5elTFLc33S3qOWmeOp8Mi7H
+  HqMBz9LAyM53Aktb1+Q3NO8fBNT2yujrGDHHIzR0/ODQJKUyNe1eqMF9soqjqG3C
+  sxiHTDCCwUPVBknvO2Ur+/ERwezfi2AhzbkxBeflaT/qTDOzGNtcPYZkKVdGAyim
+  CTxUUXN53WHG1Slv17p/5cWjibCkAlAG3RlwNTGbd6Cm9iQOORBExQ9GcmMLuiHR
+  gq+iRjXwGOwRGaAB6I6dhSxBGCza3LOyPhaZInXbxIYwgt9hbs0AyqE1pAgzIPFT
+  VSF6d2tu352oF58iWVWVMppBpk8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQU6GvDokLCZIh3E0XlEDPKxk5cwAowJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAgVLlYRqE
+  fL2eKi1yG10hNLcIrkentQPrLMJG8cc3on+wfmpLgYVPtWtzbG2PBnZzVTFfsosQ
+  Jm8qXydOVyRWH6k8KlmUpYe0+iEgyRMyzwErTPSU+is3QTjwVHW1BtOQDeK11Ugy
+  BkfRnPz1igkRWgPk/muH+SV+0vnwybSUt5Ak7IsZOPKzffvF8w6nGs2X04bLB/yd
+  74swnDmf9L3xLIl9eenmd+r/IcxaftBMQTmb0K2kb8+b2tTAojTKSgTpBPCTLKXm
+  lQHqISZBVVMIgZGbxYKri7Y0ehSCRPSH0P3Vt0q4Wg4692YXgZvZ8B5V4SyjCdY4
+  Ir306rK/DllbZA==
   -----END CERTIFICATE-----
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rscript
@@ -100,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Designed to run within a server to run RSF jobs, as well as otherservices.
+summary: Designed to run within a server to run RSF jobs, as well as other services.
 test_files: []
-has_rdoc: