rse 0.1.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36a05c67f09a77d1bdcb8afcf542ff78b0b19948651a27de39f9d572e68f0e3f
-  data.tar.gz: 717d9df27c6c4c6dcc3e3c81feb6f00786d463e473834e81b516da562cd64984
+  metadata.gz: a780fa384905f730d59549d3809d4127da681dcf95b59b55dc64a5993dd86053
+  data.tar.gz: 620728ba13757e873a334175a6cfb2dbb1893b7315afc4bdcada6ee1af64b2c5
 SHA512:
-  metadata.gz: ca8db30032ab3aaa604993761d13e7743df9f160a6a47a190d5d3bf3456223557e900e9b3fc34e15465d30e76c3f4238026482bc3a1bfc9084d8803a8dd2499f
-  data.tar.gz: 72a133e9035d09d96fc11d66e73a879fb480dc0f4012c89df4d9c6199f8a3958ebc7a2bee644d7db928f9eaed86899b28384a2ae0a21a3d2b6cb8fc6a1e6b1a8
+  metadata.gz: aeed7f472a9ad20122dbe00f914119ee985445be1d6e88d3ad4a202962594271e4ab53c082a032d80413b543674a1025a381faed21fe63e09f3795848311529b
+  data.tar.gz: 65ada2f5d1f2e27a2792e9c2dd1c39ba672eda7e21c00df9f509ac9ae718ebf623868b2a77227e3048dd2a352e993d332a6557387f790801f33addf2f49cdbb5

data/lib/rse.rb

@@ -4,64 +4,231 @@
 
 
 require 'drb'
+require 'sps-pub'
 require 'sps-sub'    
 require 'rsf_services'
 require 'remote_dwsregistry'
 require 'spspublog_drb_client'
 
 
-class Rse
-  using ColouredText
-  
-  def initialize(package_basepath=nil, host: '', port: '61000', 
-                 debug: false, loghost: 'localhost', logport: '9090', 
-                 reghost: 'localhost', spshost: 'localhost', app_rsf: nil)
-
-    @host, @port, @debug = host, port, debug
-
-    puts 'before spspublog'.info if @debug
-    log = SPSPubLogDRbClient.new host: loghost, port: logport
-    
-    puts 'before reg'.info if @debug
-    reg = RemoteDwsRegistry.new domain: reghost   
-
-    @rs = rs = RSFServices.new reg, package_basepath: package_basepath, 
-        log: log, app_rsf: app_rsf, debug: debug
-    
-    sps = SPSSub.new host: spshost
-       
-    Thread.new do
-      sps.subscribe(topic: 'rse/#') do |msg,topic|
+module Rse
+
+  class Server
+    using ColouredText
+
+    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
+
+      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: log2, 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.to_s}:#{@port}"
+
+      DRb.start_service "druby://" + @host.to_s + ':' + @port, @rs
+      DRb.thread.join
+
+    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 = rs.run_job(a.first, msg)
+            r = @rsc.run_job(a.first, msg)
           rescue
-            sps.notice 'rse_result: no job ' + a.first
+            self.notice 'rse_result: no job ' + a.first
           end
-          sps.notice 'rse_result: ' + r.inspect
+
+          self.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 ]
+            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
 
-    @rs.services['sps'] = sps
+  end
+
+end
+
+
+module RseProxy
+
+  class PassThru
+
+    # 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
+
+      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)
+
+      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
+        host, port = server
+        @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} #{($!).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)
+      fetch_server() { |rse| rse.get.method(method_name).call(*args) }
+    end
 
-    puts 'ready'
 
   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', 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, jobfilter: @jobfilter)
+      DRb.thread.join
+
+    end
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rse
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,53 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzIyMTIyNjIzWhcN
-  MTkwMzIyMTIyNjIzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKgZh3
-  L6Dw+LGmfDESYKAzFPLp7/DBCngXOpF9Xs67N9oWW6VvXuI4QfYP3TMWgML63LZW
-  fPbMIiIV77DgNzKEFIdkuVw4hBdS3rOBU8CM1rsCuzTNEz5dIk3j4X8f2u1MXj+R
-  xj8Kobrsf4T4j+GCnWmF8vs6A8mZ61ErqJZuAo/3DJk00e/feRpJMLDDauZ9jN1s
-  q/oLq0qGjgUEMfXzBpzc6ZH4ThQ/K18gVDs/5lVok+p2PnT6eBHll8KGQHrBLJ12
-  hOaPn2CfXXc1QIEhlFes5CuTga8UPslZKDsB0GUyP5i2UDCWtbLx3/lohits6ahB
-  Cq9TE50l+qgNussvAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFO4iKKVwKQysm3lDMP3B7tVBNZ0mMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBABG0GDpCcLRqUaSpe01+
-  P7faKJpVfFpGTeBOeFMhXcIfXBts6XDkt0BV5WVs8hELMOuygayayVXegSkFRPCr
-  /f6GsmIVVUffLVoKhh8sbC9WH6ZE3hddzGZ4ak98DkYE+6a9V/07qjjjQIwYJBQ7
-  FKi+vwEKeiIniq3jsTvxUnZBLx+FaO+vVWgbqi2LI5FjXWEU1+Pv0sF1dHXUKOiR
-  6VLVRd61U5PLkXgiFDUQTMQxbROuNge8Tn1sTxSPIK1FbNsKnx+1+5sonMBgu4zn
-  gou7xRtdjGdiyT3PyvX0OQ+99BHHx73PhDP1g8iDZJM0XfIVmfFIYOOCSNgKEgUM
-  V1M=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  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
+  BgkqhkiG9w0BAQsFAAOCAYEAb9n3/OhaFl0l0Gl6eVhG8rRmuWvOk8eLGAQmJ8RJ
+  qSw1990eQGzT6CIX0atlZgmqxihV2OUgivTCZZxhUYOSMN5k5YpRDp0CsudqZMBn
+  iR8hQguKSxvuEQYybU1e5exGWrEMXBZSqmzMBNGWO35gjtoOCWClrCN3aRzo58GG
+  vt3P/4N0odpk4s6CiH84pVGzclufcm4scPHhNhQBz3FSMrj3tXfLY53EjQ0r5Ih2
+  aIljodE+UKtgJTKsVQ8B7VOzygL5ifDq9VJ5EPvPN9CVopIHmEeJUHzDy1lO5B8m
+  YNYycxb46Jr0FhPdqmYV9C7kgduvaF30PUCX4nzHjIItXLvGVuhTXksSwldD85NX
+  4dt+Bk5nY7dMy57gzGYIcLJSLoz0vR5V9tMoFpaATj9+QRhkuhPJAv12rers1Imr
+  uURNkBXNIh3CdFpGJunoxVicC2OU2CglMgh+92Fjj2tRAV1M5njVnDnXcDSIsw7T
+  b5bDlFc8Qgl3+y8V3vxPf7WX
   -----END CERTIFICATE-----
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2022-01-15 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
@@ -41,7 +66,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,69 +76,69 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: rsf_services
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: remote_dwsregistry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: spspublog_drb_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -138,7 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+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.