spsclient_m2m 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b09b941ed9215741d879bb1a8b3b61b14b94d471
-  data.tar.gz: 3811e09e54d45639d0aef1cebe59f362dbaf384a
+  metadata.gz: c3215e94778d97380fb91eaadbc0ba55cd630593
+  data.tar.gz: 585c29648c9724beef8b8a7629103f4c72d7e4f3
 SHA512:
-  metadata.gz: 269ce163230409714e1896adf5f5fd5aa8e042a834cde2adddc384bdffb94d9c7ae1d15f46c4d857e546ace33f30e640fbfd0421ff0d0e18ab6e986f4630e90d
-  data.tar.gz: 872ea1d8dd1a479cdc68968c2bc7b5075dfb725b671caf71507ce85335d6c0246709335eccc9add524d31b5d5c74024aef6e78789bd7a9151c23729333caaed0
+  metadata.gz: 46c19b009809ffa210f8d1380c92a3e246d8097ae2b62c292d0c24b69bc584293bf38691f4082007fcea5ef97c1e9e39781c6a69ffbea1f59d71304fb69c1aa8
+  data.tar.gz: c496a5a4ced246539875c2b879f77a5c2eca5df2440818b9b9e0fd0748352d5cd68030eb0241d231f81d7c23fccbc2712ee2651b466fb46e7c2f6378ebda6925

data/lib/spsclient_m2m.rb

@@ -3,7 +3,6 @@
 # file: spsclient_m2m.rb
 
 
-require 'logger'
 require 'polyrex'
 require 'spstrigger_execute'
 require 'sps-sub'    
@@ -11,44 +10,55 @@ require 'sps-sub'
 
 class SPSClientM2M
 
-  def initialize(rsc, reg, keywords, px_url, logfile: nil, \
+  def initialize(rsc, reg, keywords, px_url, log: nil, \
             sps_host: 'sps', sps_port: '59000', topic: '#', 
                  reload_keyword: /^reload$/)
           
-    @rsc = rsc
-    @log = Logger.new(logfile,'daily') if logfile
-
-    @sps_address = "%s:%s" % [sps_host, sps_port]
-    @topic = topic
+    @rsc, @log, @topic = rsc, log, topic
+    
+    log.info 'SPSCLientM2M/initialize: active' if log
     
-    @sps = SPSSub.new host: sps_host, port: sps_port
+    @sps_address = "%s:%s" % [sps_host, sps_port]    
+    @sps = SPSSub.new host: sps_host, port: sps_port, log: log
     
     px = Polyrex.new px_url
 
-    @ste = SPSTriggerExecute.new keywords, reg, px, logfile: 'ste.log'
-    @keywords, @reload_keyword = keywords, reload_keyword
+    log.info 'SPSCLientM2M/initialize: before @ste' if log
+    @ste = SPSTriggerExecute.new keywords, reg, px, log: log
+    log.info 'SPSCLientM2M/initialize: after @ste' if log
+    @keywords, @reload_keyword, @reg = keywords, reload_keyword, reg
 
   end
   
   def run()
  
-    rsc = @rsc
-    ste = @ste
-    keywords = @keywords
+    log.info 'SPSCLientM2M/run: active' if log
     
-    @sps.subscribe(topic: @topic) do |raw_message, topic|
+    rsc, ste, keywords, reg, reload_keyword  = @rsc, @ste, @keywords, @reg, 
+        @reload_keyword
 
-      if raw_message.strip =~ @reload_keyword then
+    @sps.subscribe(topic: @topic) do |raw_message, topic|
+      
+      log.info 'SPSCLientM2M/run: received something' if log
+      
+      if reg and topic == 'system/clock' then
+        reg.set_key 'hkey_services/spsclient_m2m/last_seen', 
+            "#%s#" % Time.now.to_s
+      end
+      
+      if raw_message.strip =~ reload_keyword then
+        
+        log.info 'SPSClientM2M/run: reloading' if log        
+        ste = SPSTriggerExecute.new keywords, reg=nil, px=nil, log: log
         
-        puts 'reloading'
-        ste = SPSTriggerExecute.new keywords, reg=nil, px=nil, logfile: 'ste.log'        
       end
       
-      puts "[%s] SPS M2M kywrd lstnr INFO %s: %s" % \
-                      [Time.now.strftime("%D %H:%M"), topic, raw_message]
-
-      a = ste.mae topic, raw_message
-      log 'a: ' + a.inspect
+      if log then
+        log.info "SPSClientM2M/run: received %s: %s" % [topic, raw_message]
+      end
+      
+      a = ste.mae topic: topic, message: raw_message
+      log.info 'SPSClientM2M/run: a: ' + a.inspect if log
 
       # obj is the DRb object, r is the result from find_match, 
       # a is the Dynarex lookup array
@@ -63,12 +73,18 @@ class SPSClientM2M
             package_path = x.shift 
             package = package_path[/([^\/]+)\.rsf$/,1]
             
-            log "job: %s path: %s package: %s" % [job, package_path, package]
-            log 'foo: ' + rsc.r.hello
+            if log then
+              log.info "SPSClientM2M/run: job: %s path: %s package: %s" % \
+                         [job, package_path, package]
+            end
+                         
             rsc.run_job package, job, {}, args=x, package_path: package_path
           }, 
           sps: ->(x, rsc){ @sps.notice x },
-          ste: ->(x, rsc){ log 'before ste run'; ste.run x }
+          ste: ->(x, rsc){ 
+            log.info 'SPSClientM2M/run: before ste run' if log
+            ste.run x 
+          }
         }
 
       end
@@ -80,11 +96,13 @@ class SPSClientM2M
           Thread.new do
             
             begin
+
               h[type].call x, rsc
             rescue
-              warning =  'SPSClientM2M warning: ' + ($!).inspect
-              puts warning
-              log warning
+              
+              err_msg = 'SPSClientM2M/run/error: ' + ($!).inspect              
+              log ? log.debug(err_msg) :  puts(err_msg)
+
             end
             
           end # /thread
@@ -96,10 +114,11 @@ class SPSClientM2M
     end        
     
   end
-
+  
   private
   
-  def log(s)
-    @log.debug(s) if @log
+  def log()
+    @log
   end
-end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spsclient_m2m
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -12,26 +12,26 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDQyNjE5MzgxMFoXDTE3MDQyNjE5MzgxMFowSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MTAyOTEwMjY1NVoXDTE4MTAyOTEwMjY1NVowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAN0INqaz3cN0nq+803zH8krhxh9LwVbEhi0e6vmMXjr2IAEluB+SCRrQEELx
-  FY/XRhkqTVSkXC9eXW9zgs6ij+aJIuUH8QGhLI6Nw+G5/Y4xL9j6V5yTT1X27/XJ
-  JyEfP3LuEzcm/IlM7Gihg/mBSyKLlFl6XaGsuBNIvD7P/BgoPQxY+2fGStni1DC7
-  gDL0ITWZNpOfF8a/AhV3l5L0yElZJQrU42fsZnsnQRITCBjHP2f8XlE6Xe66cytv
-  scQzJOzrDBO2QXNq0asBXPHVbzJVVkYz1kyztO77Ri5xoPk8RfLtcJxhdbfNNogj
-  8SDD2mabP/Z0/QgYTfwTK59303MCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUJyOv3ICWn5lJ9QbR6kdkiShirSEwJgYDVR0RBB8w
+  ggEBALk1PKr5eDSSMvprWKGzDShs3AezUuY8dAR1KFuqvlh7qgb6mFhrMS98A92C
+  lJ1V3cf13jiVmxHCn/U9kQsBWqBpBWqnSQJn4eZfN5XqVjPSiL9l+jLiawInI5Zz
+  eRQFYiVMJexRzPucufk4YB05WGhOjLiHZ3/JicbxHIujkdv3oTh09XnmzvjNn75i
+  6uBuPVoPrEAzxRdc3nTAE4e7UdBuwHlctuytfjFGNK6+ZglwSqhx/xB5H4Mz8ueN
+  WYgbRtvvLHV4D2FxMkxTnSR4tnixG2ftD1i/Y4fGnNKVBC1MbJaR9jFyRT44p4Cf
+  VfHaf9g5UAO81wt+O0WMWzQTkbsCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUDU7oTCjxZxmATPTztkx719h58D4wJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEATVmsnkNj
-  AOWyWb1IKxaxGhGu07L6TNE0p6oIQt5BLYsGgS7Bk5HtLuRBUwXDgyD/r35lIito
-  EWoEAfmRzUxMg3MYcx5eUU6qdXA9FYMK9ekXi5ytuag7fuTiR5UcoQzXJYSj8sRS
-  oRchuUoWu0FpOblbIc8UgYcI+CXRo+TNqpt9XfAo41n4rzo0kmiqgfsQHvPXrKuG
-  fa7QXsvmGx0F/LB+8csio2JXYCH71wUIh7uj9gt58dZFNMei2sK8PptCNusG/yNd
-  9PUm89FQvfRnzWxLuS4+ZXMo8Zo4MQHDdOuNAQpSDGVy1GIHrNU04foP5Bd86hc0
-  78GKZWkTxeiOTA==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAAAgXVhPr
+  b+7OF5FlfBUOU2RMYyw4F9Ti4LKhu14SArIrVfdo6jCVy2GPWS/xjkb9ObRaKqny
+  ForrpEshHHTmnHKHrh9mCk4axZHNRkDsjeLOoXSRcJOOvLpLhN2ynp5gFeBGHDo3
+  FrmY/HMIPMGvTRuO1/I/74YIDU+Y0HJrbeh7btmPu+okxKT2qjjMClCoc2IVFWbe
+  VKWtMHdDKH9Lr1X7T6iMMX7Om6P0MLfcEhdTUIv+hXCaj5hzE+S/9FAHqu18S+/w
+  dBXn9TUi+xrV99j23F6po2HBGSFZdaNVFl9d+1zL8TzksvvfSxoxQWf3cCHRxQxa
+  dPHfn+8RHWvT5A==
   -----END CERTIFICATE-----
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex
@@ -62,7 +62,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: sps-sub
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.6
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: The SPSClient_M2M gem is designed to run as a service with the RSF_Services