rsf_services 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 40e361339add15a027655df802c482cc68865edd
4
- data.tar.gz: 94900ad43d1f129a5c24ae546abe05f219bb9329
3
+ metadata.gz: ccb3d3cac479ccaa32db93d130a891e1d2874dbf
4
+ data.tar.gz: 8b0aca3a4c9cf9a6d674b880d3a7cdbcba41e96c
5
5
  SHA512:
6
- metadata.gz: cb676dc1445acfa827919e60ba91a5ca691cbf9ec05f39ad331ac5ab79362e70fd0edf3369c8bfbfe02620ab234bd7ddb4a5751a0cbe8f81dacdbc7fae8acf27
7
- data.tar.gz: 2c755829411fa018547128f7eaaa7e3d7f65799b6300b8c7ab606b43d7f1790721746a2217d20dc889fd7f8ff2813fa107326958f25a7738a133f6b9eb6e8678
6
+ metadata.gz: 98fde9da851adb83368a1ede0e53877a30ae8fe903579cf7a7c4db4ba207ec440d2c0a09af4fa6ebcc55bd1da37ad16a29b069ca91c69c087e333da15f647d03
7
+ data.tar.gz: f8a16754c8f7a5dee10af5b4572c294f39a4bc085eae53efecc74ed134cf1643a58786883f1847c61ba6c2a0ddc02185d67f20a0e3042cb498894c66f3b200c4
checksums.yaml.gz.sig CHANGED
Binary file
data.tar.gz.sig CHANGED
Binary file
data/lib/rsf_services.rb CHANGED
@@ -11,27 +11,28 @@ class RSFServices < RScript
11
11
 
12
12
  attr_reader :services
13
13
 
14
- def initialize(reg_path='', package_basepath: '', log: nil)
14
+ def initialize(reg_path='', package_basepath: '', logfile: nil)
15
+
16
+ @log = Logger.new logfile, 'daily' if logfile
15
17
 
16
- super()
18
+ super(log: logfile)
17
19
 
18
20
  @package_basepath, @services = package_basepath, {}
19
- @log = log
20
- @logger = Logger.new log, 'daily' if log
21
21
 
22
22
  if reg_path.length > 0 then
23
23
 
24
24
  @services['registry'] = reg = DWSRegistry.new reg_path
25
25
 
26
26
  # load the system/startup RSF jobs
27
+
27
28
  jobs = reg.get_keys('system/startup/.[load="1"]').inject({}) do |r, job|
28
29
  settings = reg.get_keys("system/packages/#{job.name}/*")\
29
30
  .inject({}){|r,x| r.merge(x.name.to_sym => x.text) }
30
31
  r.merge(job.name => settings)
31
32
  end
32
-
33
+
33
34
  jobs.each do |package, settings|
34
- r = run_job(package.to_s, '//job:load', settings,
35
+ r = run_job(package.to_s, 'load', settings,
35
36
  package_path: settings[:url])
36
37
  end
37
38
  end
@@ -41,30 +42,38 @@ class RSFServices < RScript
41
42
  def run_job(package, jobs, params={}, *qargs,
42
43
  package_path: ("%s/%s.rsf" % [@package_basepath, package]))
43
44
 
44
- yield(params) if block_given?
45
- result, args = read([package_path, jobs.split(/\s/),qargs].flatten)
45
+ log 'inside run job' + ("package: %s jobs: %s params: %s qargs: %s package_path: %s" % [package, jobs, params, qargs, package_path])
46
+ yield(params) if block_given?
47
+
48
+ a = [package_path, jobs.split(/\s/).map{|x| "//job:%s" % x} ,qargs].flatten
49
+ result, args = read(a)
46
50
 
47
51
  rws = self
48
-
52
+
49
53
  begin
54
+
55
+ log 'result : ' + result
50
56
 
51
57
  r = eval result
58
+
59
+ log 'r : ' + r.inspect
52
60
  return r
53
61
 
54
62
  rescue Exception => e
55
63
  params = {}
56
64
  err_label = e.message.to_s + " :: \n" + e.backtrace.join("\n")
65
+ log 'err_label : ' + err_label.inspect
57
66
  log(err_label)
58
67
  end
59
-
68
+
60
69
  end
61
70
 
62
71
  private
63
72
 
64
73
  def log(msg)
65
- if @log == true then
66
- @logger.debug msg
67
- end
74
+
75
+ @log.debug msg if @log
76
+
68
77
  end
69
78
 
70
79
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rsf_services
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Robertson
@@ -10,28 +10,28 @@ bindir: bin
10
10
  cert_chain:
11
11
  - |
12
12
  -----BEGIN CERTIFICATE-----
13
- MIIDmDCCAoCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBJMRIwEAYDVQQDDAlnZW1t
14
- YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjETMBEGCgmSJomT
15
- 8ixkARkWA2V1XzAeFw0xNDA3MTIxOTQwMTlaFw0xNTA3MTIxOTQwMTlaMEkxEjAQ
16
- BgNVBAMMCWdlbW1hc3RlcjEeMBwGCgmSJomT8ixkARkWDmphbWVzcm9iZXJ0c29u
17
- MRMwEQYKCZImiZPyLGQBGRYDZXVfMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
18
- CgKCAQEA1DClU6Pd/0b4nvq/x5LFVUImRhnj6C/6fdSBcdyFObJOH8C5i6Mllr/G
19
- eRykF+Qvh1ZFi+RjrxecMIN5rZ5A6QIxqEhlLM2SQKOf4vIdqjrGQIcHeD8fsk/N
20
- djPLrfiX2OHYRQrsj4bAlMTQVTy70gK8I3+NOUpePyzYe52KX0Vde/xD+stvupCb
21
- CmswhWsbjFJGrQusFr5QFmJMgtPoxqWyNtkhPiqsM5eqp3r9ZJAD2veSqox9rq/Z
22
- dVRHwQG9DvVXyqveXqvb545X2Ef0+Nw9uNBDEJfSUvmFwT/q/l5Ps+7ydj+ansxx
23
- IhheD5wkWMOs/NkuUVas1wMMmOGrzQIDAQABo4GKMIGHMAkGA1UdEwQCMAAwCwYD
24
- VR0PBAQDAgSwMB0GA1UdDgQWBBQFiNJVQtZNj1IoNIOz+GzxFRjJ8DAmBgNVHREE
25
- HzAdgRtnZW1tYXN0ZXJAamFtZXNyb2JlcnRzb24uZXUwJgYDVR0SBB8wHYEbZ2Vt
26
- bWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAq6pKR
27
- Wx9Y5UDCEmxphcNgT90e9gR5B1zxSktEF1GO9WtrG/J/Eb6G48tweJKe1nrib4La
28
- Zx3+vHIDj7FguCB1fQgQx/pkx64kW+CZOzWtLOrsJiqKrme7/nak9TZyBy2BF5K2
29
- oCTU2uxFT74h6FmPLlrDR206F04F4HaFzJKNMKG7cDhanQs5hsuXFAEQdD6DWJik
30
- awGab/qAohwrAtP/MCNls9YNFvBWWDPozQ0WZlCe8zXjoTAtDpYUVBznhuWkdPpC
31
- FpnFf8SgVEggA3UJApMkdLJgylaFVRWB9YefdTYWcBgpvwnI5hrcpw06jXRmazk5
32
- JTUarTGO425WKYWE
13
+ MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
14
+ YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
15
+ 8ixkARkWAmV1MB4XDTE2MDExNDIxNDM0NFoXDTE3MDExMzIxNDM0NFowSDESMBAG
16
+ A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
17
+ EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
18
+ ggEBAMFISA5WF7jU3Qnw5RoDh+utpZB5mvdVW+Eai5elTFLc33S3qOWmeOp8Mi7H
19
+ HqMBz9LAyM53Aktb1+Q3NO8fBNT2yujrGDHHIzR0/ODQJKUyNe1eqMF9soqjqG3C
20
+ sxiHTDCCwUPVBknvO2Ur+/ERwezfi2AhzbkxBeflaT/qTDOzGNtcPYZkKVdGAyim
21
+ CTxUUXN53WHG1Slv17p/5cWjibCkAlAG3RlwNTGbd6Cm9iQOORBExQ9GcmMLuiHR
22
+ gq+iRjXwGOwRGaAB6I6dhSxBGCza3LOyPhaZInXbxIYwgt9hbs0AyqE1pAgzIPFT
23
+ VSF6d2tu352oF58iWVWVMppBpk8CAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
24
+ DwQEAwIEsDAdBgNVHQ4EFgQU6GvDokLCZIh3E0XlEDPKxk5cwAowJgYDVR0RBB8w
25
+ HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
26
+ c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAgVLlYRqE
27
+ fL2eKi1yG10hNLcIrkentQPrLMJG8cc3on+wfmpLgYVPtWtzbG2PBnZzVTFfsosQ
28
+ Jm8qXydOVyRWH6k8KlmUpYe0+iEgyRMyzwErTPSU+is3QTjwVHW1BtOQDeK11Ugy
29
+ BkfRnPz1igkRWgPk/muH+SV+0vnwybSUt5Ak7IsZOPKzffvF8w6nGs2X04bLB/yd
30
+ 74swnDmf9L3xLIl9eenmd+r/IcxaftBMQTmb0K2kb8+b2tTAojTKSgTpBPCTLKXm
31
+ lQHqISZBVVMIgZGbxYKri7Y0ehSCRPSH0P3Vt0q4Wg4692YXgZvZ8B5V4SyjCdY4
32
+ Ir306rK/DllbZA==
33
33
  -----END CERTIFICATE-----
34
- date: 2014-07-12 00:00:00.000000000 Z
34
+ date: 2016-01-14 00:00:00.000000000 Z
35
35
  dependencies:
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rscript
@@ -100,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
100
100
  version: '0'
101
101
  requirements: []
102
102
  rubyforge_project:
103
- rubygems_version: 2.2.2
103
+ rubygems_version: 2.4.8
104
104
  signing_key:
105
105
  specification_version: 4
106
- summary: Designed to run within a server to run RSF jobs, as well as otherservices.
106
+ summary: Designed to run within a server to run RSF jobs, as well as other services.
107
107
  test_files: []
108
- has_rdoc:
metadata.gz.sig CHANGED
Binary file