rse 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4815a8971c00376767179739875abeb246ab65a28ff6a43cba52055238585e2
-  data.tar.gz: 1e0008e4927b0cdc5771965c682eb3246daca3eed882c4c6c2fe0611038efaf3
+  metadata.gz: f1157852fad295d25dac2a7e5e8907d3c0afd61682d4fdf2b926de56bfc116aa
+  data.tar.gz: 9ee0c46b6cace3db05c107f1f29e3c7ff105a8bd51b87310dcdd0895bf8d30d4
 SHA512:
-  metadata.gz: 573f887917c5ba682e637f8b1901b6afb404499bbbd9d07a957f59eed5c8dffd7b05524f2f379a5ee65609f35ad2313abe277131afb01ba8cd88752873b60918
-  data.tar.gz: fade8a505895afcf58d04e3c0573f3efe87c5fcdaad7c02cf69c09311acb2364b7cb3ec05110890cc74f4f5ed9b0d336b5aa02d33b27b306d738e341a9ce912b
+  metadata.gz: 71df363891458d1a2f70ee1c325469395f11644dfdcfafb9965f81292340ec2833855751de0abaa09fb994f829a3b8b1ab10a077d12518f4d6a9b7ca446600b7
+  data.tar.gz: 8fa3a49adac81375fc07e17b9527a523703a918b48625a1e1f07f2257a4c7966133d655fc28b82f57c18860c319924195923b6f0276212ad9d526fb066919420

data/lib/rse.rb

@@ -12,27 +12,32 @@ require 'spspublog_drb_client'
 
 
 module Rse
-  
+
   class Server
     using ColouredText
-    
-    def initialize(package_basepath=nil, host: '0.0.0.0', port: '61000', 
-                  debug: false, loghost: nil, logport: '9090', 
+
+    def initialize(package_basepath=nil, host: '0.0.0.0', port: '61000',
+                  debug: false, loghost: nil, logport: '9090', log: nil,
                   reghost: nil, spshost: nil, app_rsf: nil)
 
       @host, @port, @debug = host, port, debug
 
       puts 'before spspublog'.info if @debug
-      log = loghost ? SPSPubLogDRbClient.new(host: loghost, port: logport) : nil
-      
+
+      log2 = if log then
+        log
+      elsif loghost
+        SPSPubLogDRbClient.new(host: loghost, port: logport)
+      end
+
       puts 'before reg'.info if @debug
       reg = reghost ? RemoteDwsRegistry.new(domain: reghost) : nil
 
-      @rs = rs = RSFServices.new reg, package_basepath: package_basepath, 
-          log: log, app_rsf: app_rsf, debug: debug
-      
+      @rs = rs = RSFServices.new reg, package_basepath: package_basepath,
+          log: log2, app_rsf: app_rsf, debug: debug
+
       @rs.services['sps'] = SPSPub.new(host: spshost) if spshost
-      
+
       puts 'ready'
 
     end
@@ -45,34 +50,34 @@ module Rse
 
     end
   end
-  
+
   class Subscriber < SPSSub
-    
+
     def initialize(host: 'rse.home', spshost: 'sps.home')
-      
+
       @rsc = RSC.new(host)
       super(host: spshost)
 
     end
-    
+
     def subscribe(topic: 'rse/#')
-      
+
       super(topic: topic) do |msg, topic|
-      
+
         a = topic.split('/')[1..-1]
-        
+
         if a.length < 2 then
-          
+
           begin
             r = @rsc.run_job(a.first, msg)
           rescue
             self.notice 'rse_result: no job ' + a.first
           end
-          
+
           self.notice 'rse_result: ' + r.inspect
-          
+
         else
-          
+
           package, job = a
 
           begin
@@ -80,122 +85,150 @@ module Rse
           rescue
             self.notice 'rse_result: no job ' + a.first
           end
-          
+
           self.notice "rse_result/%s/%s: %s" % [package, job, r.inspect ]
         end
-        
+
       end
-    end  
-    
-  end  
+    end
+
+  end
 
 end
 
 
 module RseProxy
-    
+
   class PassThru
 
-    def initialize(serversx=[], servers: serversx, log: nil )
-      
+    # job_filter (which is optional) expects a block
+    #
+    def initialize(serversx=[], servers: serversx, log: nil, jobfilter: nil )
+
       DRb.start_service
-      
+
       @servers = servers.map do |x|
-        
-        host, port = x.is_a?(Hash) ? [x[:host], x[:port]] : x        
-        
+
+        host, port = x.is_a?(Hash) ? [x[:host], x[:port]] : x
+
       end
-      
+
       @log = Logger.new log, 'daily' if log
-      
+
+      @rse = nil
+      @jobfilter = jobfilter
+
     end
 
     def delete()
       fetch_server() { |rse| rse.delete }
     end
-                     
+
     def get()
       fetch_server() { |rse| rse.get }
     end
-                     
+
     def put()
       fetch_server() { |rse| rse.put }
     end
-                     
+
     def post()
       fetch_server() { |rse| rse.post }
     end
-      
+
     def package_methods(name)
       fetch_server() { |rse| rse.package_methods(name) }
     end
-      
+
     def run_job(package, job, params={}, *args)
-      
-      @log.info "package: %s, job: %s, params: %s, args: %s" \
-          % [package, job, params, args] if @log
-      
-      fetch_server() { |rse| rse.run_job package, job, params, *args    }
-      
-    end
-    
-    def fetch_server()
-      
+
+      if @log then
+        @log.info "package: %s, job: %s, " +
+            "params: %s, args: %s" % [package, job, params, args]
+      end
+
+      #we pass in the job to determine the server
+      fetch_server(job) do |rse|
+        rse.run_job package, job, params, *args
+      end
+
+    end
+
+    def fetch_server(job=nil)
+
+      host, port = nil, nil
+
+      exit if @servers.empty?
+
+      # using a job filter we can send a job (by checking its name) to
+      # a specific server
+      #
+      r = @jobfilter.call(job) if job and @jobfilter.is_a? Proc
+
+      server = if r then
+        r
+      else
+        @log.info 'job: ' + job.inspect if @log
+        @servers.first
+      end
+
+      puts 'server: ' + server.inspect
+
       begin
-        
-        servers = @servers.clone
-          
-        server = servers.shift
         host, port = server
-        rse = DRbObject.new_with_uri("druby://#{host}:#{port}")    
-        yield(rse) if block_given?
-        
+        @rse = DRbObject.new_with_uri("druby://#{host}:#{port}")
+
+        yield(@rse) if block_given?
+
       rescue
-        
+
+        @servers.shift unless port.to_i > 61005
+        @rse = nil
         puts ($!).inspect
-        @log.warn "server #{host}:#{port} down" if @log
-        retry if servers.any?        
-        
+        @log.warn "server #{host}:#{port} #{($!).inspect}" if @log
+        #sleep 1
+        #jr20210725 retry
+
+
       end
-      
+
     end
 
     def type()
       fetch_server() { |rse| rse.type }
     end
-    
+
     def type=(s)
       fetch_server() { |rse| rse.type=(s) }
     end
-    
+
     private
-  
-    def method_missing(method_name, *args)    
+
+    def method_missing(method_name, *args)
       fetch_server() { |rse| rse.get.method(method_name).call(*args) }
-    end    
-      
-    
+    end
+
+
   end
 
   class Server
-    
-    def initialize(host: 'rse.home', port: '61000', servers: [], log: nil, 
-                   spshost: 'sps.home')
-      
+
+    def initialize(host: 'rse.home', port: '61000', servers: [], log: nil,
+                   spshost: 'sps.home', jobfilter: nil)
+
       @host, @port, @servers, @log = host, port, servers, log
       @spshost = spshost
-      
+      @jobfilter = jobfilter
+
     end
-    
+
     def start()
-      
-      DRb.start_service "druby://#{@host}:#{@port}", 
-          PassThru.new(@servers, log: @log)
-      DRb.thread.join      
-      
+
+      DRb.start_service "druby://#{@host}:#{@port}",
+          PassThru.new(@servers, log: @log, jobfilter: @jobfilter)
+      DRb.thread.join
+
     end
   end
-  
-end
-
 
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rse
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAxMTIyMjEyNDA3WhcN
-  MjExMTIyMjEyNDA3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCihhtC
-  NWhPDa/+7n40XI/Gwe6vP1Fh5BN3PCm+oKlMMM0R8054kn1OiCsnX1Y+D9/L6ru7
-  +h1EnAkl87iZpi9gQdYkZv6jXd1/MSjb9fIYo9vHUBx9cNxFCUdI9VYFuECCWzYM
-  O47FEYzXcCoRWOMEi0jClV3rrXrQOdX4rgxnNW0r6Z4RGhnAe4IHA0l7eOdO9TVC
-  KJR1NIcqtAPhXvDN+tJjvH/ruHyTq1gJU/6rkBfqRPN4CboFQv6m10SwaQvSXcbi
-  RtK4WzbX13SQNazl4txUf2Gho+Ox+Uqr9teQOhWbmj2XSJJpIXBBvP1xzGvXzONp
-  dc8lMhyz9hn4PDcbL1HtS0uGHAORdNPV1J1Gy2OBMpdqP4E3faKzC+khX8HPgiU+
-  BnONs4Nx5d1Y5WW5sImGxF0+5pBPutc0afePXDaQUswrzpXMJzKTnRfOk6NmVfgq
-  eSjMorIKV1GWSaY3bw1MfzMZBh+3lmxyo3X9qrpd/qOGGKqXGzqPZEYHs28CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUeSSXAcam
-  wjFwibMEFjMZxalP9GQwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMjEzMjE0OTI3WhcN
+  MjIxMjEzMjE0OTI3WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC5GgnY
+  3NAIglTeWLyCCzCJEg7gjKrf9LiVJWjD7RC3Ga13pueAD94Lk8hNqb5zUt0D19nv
+  HpCCvxjGhYSsekaqZHY+dtR6uJKN50mdHHWU7Tg+46uUMFsgGm9pVrcLtlVlqHhs
+  C4agY/2p28UvU+H7fUQinkbpgaD+bMJ4oYSrTLTUGhuqWDcQpH0kH+lVAwdhjFTs
+  hn0K2E3ikEr0RNW0x1v+XPabxpxi58V3tqV8HpMUvrQ9nNLsjL3hi3RPOd/1yuvQ
+  /HsQY9W1WGdhwZ8DF94E0rS4i6pmrAYW0mNm0euGPEhrQ8FeNznaSrAGghqFJQQ4
+  NzkRuwBUIGj3Fg/bj7FGJn8Gbh97JMxnn9W0VrvlczKnLOH/nLVw/jc9b7hx21yh
+  XYDfwlWtHaPIfbqfs+p1GSP8dtWflT8cnUs/jFav0JE9B6E/5DBL09J6TJctwOEF
+  FQhLb45sWsXHi/wgpHwUKtdXIU1+JUYn4ZRw+RO+sYN6ii1TodgfMIjqySkCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU06PIdeEz
+  +zgy9XVLqBDAyk7tw10wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAIfe8sv0O48m/92CylOWvxvLk5k4QwkXQloTTLkAQ
-  2n1L/09T78ER6rGXaTfIZeUEEo/nPBHcbAJOOfo7Q+liRCB14690XrfgAFaeuYnx
-  T/d1YEPn0FgYCgAeynu9Ho+mHKAQM73HYWvHkHHJtvqIjMWfC/IQU3HZrD3lBKph
-  41FjKsTzo2+lMeArUVCI7atpZaquuKoKm1Y9WHTwS4Pf37U1L1hKRkDYWydYR9dp
-  +6e9OaaiG4H5vFDzqrN0okE/k0BgGe7XXg6NcMOlqlfYfeW+OZdNOjozMZgqkVpf
-  /s5TlMG8sJ2a3/8ldYCcqd3Fw5+l1Wy2ZgRpjFhTnQ4nwqRIckkwUoQVeWLfLEJO
-  P3owz5MZ0sRUb8tOQEY7rDI2+Cue92lCbxXNOnIUEVNd/CAlK4WDKgAgzjt1t6SO
-  IpNfs/xhu8xjRvzdsqJVUemNMTetQWq1uJCL744VBWdD+Aya9lFL2MnAXiPPhhpf
-  H7Eu+IZctiL+0kLHA1iPEKAx
+  BgkqhkiG9w0BAQsFAAOCAYEAb9n3/OhaFl0l0Gl6eVhG8rRmuWvOk8eLGAQmJ8RJ
+  qSw1990eQGzT6CIX0atlZgmqxihV2OUgivTCZZxhUYOSMN5k5YpRDp0CsudqZMBn
+  iR8hQguKSxvuEQYybU1e5exGWrEMXBZSqmzMBNGWO35gjtoOCWClrCN3aRzo58GG
+  vt3P/4N0odpk4s6CiH84pVGzclufcm4scPHhNhQBz3FSMrj3tXfLY53EjQ0r5Ih2
+  aIljodE+UKtgJTKsVQ8B7VOzygL5ifDq9VJ5EPvPN9CVopIHmEeJUHzDy1lO5B8m
+  YNYycxb46Jr0FhPdqmYV9C7kgduvaF30PUCX4nzHjIItXLvGVuhTXksSwldD85NX
+  4dt+Bk5nY7dMy57gzGYIcLJSLoz0vR5V9tMoFpaATj9+QRhkuhPJAv12rers1Imr
+  uURNkBXNIh3CdFpGJunoxVicC2OU2CglMgh+92Fjj2tRAV1M5njVnDnXcDSIsw7T
+  b5bDlFc8Qgl3+y8V3vxPf7WX
   -----END CERTIFICATE-----
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sps-pub
@@ -81,22 +81,22 @@ dependencies:
   name: rsf_services
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: remote_dwsregistry
   requirement: !ruby/object:Gem::Requirement
@@ -123,22 +123,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -163,7 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Executes Ruby jobs (using the rsf_services gem) from a DRb server.