rse 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37030503f31b2375b3c839fa1a8badf4dfdfa084f4b590ca75709132971a4730
-  data.tar.gz: 9de364427b5014027fcf2c93c7bc930b2e94db3c877c7a0a541943f6214f7e29
+  metadata.gz: e4815a8971c00376767179739875abeb246ab65a28ff6a43cba52055238585e2
+  data.tar.gz: 1e0008e4927b0cdc5771965c682eb3246daca3eed882c4c6c2fe0611038efaf3
 SHA512:
-  metadata.gz: 4cfdaa962a33cd09113d867dc528e46c682a8b3c588fc688a71958fb6f9b1a375360bc81a95ca4827fcca652b84528bf3f375592b7f654428c16d2a5fa4f43a4
-  data.tar.gz: 9e77f798d315d8b836fff1a9a06133920d2d88769b3d4bea3b032cbb2c5d2792ab9f75fc3edf05e4ae96b3ccbde9dd9a54090394f6edb7e9ca59f881173ceb1b
+  metadata.gz: 573f887917c5ba682e637f8b1901b6afb404499bbbd9d07a957f59eed5c8dffd7b05524f2f379a5ee65609f35ad2313abe277131afb01ba8cd88752873b60918
+  data.tar.gz: fade8a505895afcf58d04e3c0573f3efe87c5fcdaad7c02cf69c09311acb2364b7cb3ec05110890cc74f4f5ed9b0d336b5aa02d33b27b306d738e341a9ce912b

data/lib/rse.rb

@@ -4,68 +4,198 @@
 
 
 require 'drb'
+require 'sps-pub'
 require 'sps-sub'    
 require 'rsf_services'
 require 'remote_dwsregistry'
 require 'spspublog_drb_client'
 
 
-class Rse
-  using ColouredText
+module Rse
   
-  def initialize(package_basepath=nil, host: '0.0.0.0', port: '61000', 
-                 debug: false, loghost: nil, logport: '9090', 
-                 reghost: nil, spshost: nil, app_rsf: nil)
+  class Server
+    using ColouredText
+    
+    def initialize(package_basepath=nil, host: '0.0.0.0', port: '61000', 
+                  debug: false, loghost: nil, logport: '9090', 
+                  reghost: nil, spshost: nil, app_rsf: nil)
 
-    @host, @port, @debug = host, port, debug
+      @host, @port, @debug = host, port, debug
 
-    puts 'before spspublog'.info if @debug
-    log = loghost ? SPSPubLogDRbClient.new(host: loghost, port: logport) : nil
-    
-    puts 'before reg'.info if @debug
-    reg = reghost ? RemoteDwsRegistry.new(domain: reghost) : nil
+      puts 'before spspublog'.info if @debug
+      log = loghost ? SPSPubLogDRbClient.new(host: loghost, port: logport) : nil
+      
+      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.services['sps'] = SPSPub.new(host: spshost) if spshost
+      
+      puts 'ready'
+
+    end
+
+    def start()
+      puts 'starting ...'
+      puts "druby://#{@host}:#{@port}"
+      DRb.start_service "druby://#{@host}:#{@port}", @rs
+      DRb.thread.join
 
-    @rs = rs = RSFServices.new reg, package_basepath: package_basepath, 
-        log: log, app_rsf: app_rsf, debug: debug
+    end
+  end
+  
+  class Subscriber < SPSSub
     
-    sps = spshost ? SPSSub.new(host: spshost) : nil
+    def initialize(host: 'rse.home', spshost: 'sps.home')
+      
+      @rsc = RSC.new(host)
+      super(host: spshost)
 
-    if sps then
+    end
+    
+    def subscribe(topic: 'rse/#')
+      
+      super(topic: topic) do |msg, topic|
+      
+        a = topic.split('/')[1..-1]
         
-      Thread.new do
-        sps.subscribe(topic: 'rse/#') do |msg,topic|
-          a = topic.split('/')[1..-1]
-          if a.length < 2 then
-            begin
-              r = rs.run_job(a.first, msg)
-            rescue
-              sps.notice 'rse_result: no job ' + a.first
-            end
-            sps.notice 'rse_result: ' + r.inspect
-          else
-            package, job = a
-            begin
-              r = rs.run_job(package, job, {}, msg)
-            rescue
-              sps.notice 'rse_result: no job ' + a.first
-            end
-            sps.notice "rse_result/%s/%s: %s" % [package, job, r.inspect ]
+        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
+            r = @rsc.run_job(package, job, {}, msg)
+          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
 
-      @rs.services['sps'] = sps
+
+module RseProxy
+    
+  class PassThru
+
+    def initialize(serversx=[], servers: serversx, log: nil )
+      
+      DRb.start_service
+      
+      @servers = servers.map do |x|
+        
+        host, port = x.is_a?(Hash) ? [x[:host], x[:port]] : x        
+        
+      end
+      
+      @log = Logger.new log, 'daily' if log
       
     end
 
-    puts 'ready'
+    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()
+      
+      begin
+        
+        servers = @servers.clone
+          
+        server = servers.shift
+        host, port = server
+        rse = DRbObject.new_with_uri("druby://#{host}:#{port}")    
+        yield(rse) if block_given?
+        
+      rescue
+        
+        puts ($!).inspect
+        @log.warn "server #{host}:#{port} down" if @log
+        retry if servers.any?        
+        
+      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)    
+      fetch_server() { |rse| rse.get.method(method_name).call(*args) }
+    end    
+      
+    
   end
 
-  def start()
-    puts 'starting ...'
-    DRb.start_service "druby://#{@host}:#{@port}", @rs
-    DRb.thread.join
-
+  class Server
+    
+    def initialize(host: 'rse.home', port: '61000', servers: [], log: nil, 
+                   spshost: 'sps.home')
+      
+      @host, @port, @servers, @log = host, port, servers, log
+      @spshost = spshost
+      
+    end
+    
+    def start()
+      
+      DRb.start_service "druby://#{@host}:#{@port}", 
+          PassThru.new(@servers, log: @log)
+      DRb.thread.join      
+      
+    end
   end
+  
 end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rse
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,32 +11,52 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwMzI1MjIwNjI1WhcN
-  MjAwMzI0MjIwNjI1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDSmdqb
-  vlxlGfBzluHMGj/iMbNgP1RHxRerWYNFm4RULDYmEgzziyDvmSdiIJhrmUTQ9kAu
-  5/1dG5Qv/DexeUIAGeDcNQer+1WqY5szZwXlg+dmmqRNjZTvtiCt+Nv8srSdY2+V
-  Ba36+CuyuZNTJIlQUlG5+byT3+R29ZNqP5fGfBIrpnK70HDqcpn9+63HwbVnUXeV
-  aOqh+6FSU1eoR+GyLeG4kOVndEZlTUrn9FXOeTU81dVSkXbWat8UfJXb7ldIb4Ot
-  LkLbcnQJLVco3zwp2kus3y6lYBFdFC/xgV3jq7RtrPbgZFbG/uMQcGIZ96++Zmrg
-  ZSc4/fD4ptFtdrVvVHL+I6JEpru6kJ35OPXa1x+LC4taIf9rNZ+t21Kq6Tb6+UVy
-  tRvvfrhZJtbXyjOjHBZEszk2D6unRIFbnzIb/fh0PKdsrz4JVkHZ8d2kGWnmtaFU
-  3wTGzz6QSAQHtsOLPGAbUmn6HHYzTBrOVXxQ44kvK51B/jdtwxojJGydbX0CAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUq4MAVfVC
-  BWX1ArO4wymRRhR+ySYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  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
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAphtm0kF4w34GsaclAwrWBqA01scjJhWenRadT6+5
-  3nJZc7284zWwd11H0rEf64CEbgxdUhqVg2+tcKaBdvCrPw7+I+gMEr4B0MD1r2dq
-  nJct4Q/2TD1AGPFKa+GYWGpXH2yKJiHhIHs+2m4Iugb4mAukhwuXaKeZCiENMp/p
-  i31FVPkmCk26KSIfwZoNldBjlpfmEwMyBNlNgv7zYZuMf+Qchqvt2J+TgWQ5rOSY
-  RoLsFrst2KMslz3sxRLmwu8BJk6OMPgclk5B4cR+2lRhev2RUXUI72dsAHtOe5Fx
-  ovNEkn9DLhVi3Onf1trHGYeW5GyB5q9XuOnCVhCyARmOkcS07TCu1MuUIypVnUOl
-  m1/DlryaUR8I8InR60+GgcH5B8Rg9B1nO91wh1wYEy6psDkAzYllLXT53hu2gDjX
-  gLIcOm5figGx9YoCYFixR00ARSKpMaCDMCJwL3iA1m4pL04Smvm0XogHNs49NRTP
-  odE6WphoqAaREBcw0TYGZZLM
+  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
   -----END CERTIFICATE-----
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2020-11-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sps-pub
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.5
 - !ruby/object:Gem::Dependency
   name: sps-sub
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Executes Ruby jobs (using the rsf_services gem) from a DRb server.