rsmp 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6e7b6922c4aad939b08a2235e05a79ef5662534ec401d204255671c2511ede1
-  data.tar.gz: e81f0a7c38fb98317e18ebfb3879f43bd878a947de41b5d49e14953d5ed7f86e
+  metadata.gz: 96c6fb10c7c6e59410be4cbd59a29ca3cd157231e3e8800982616c0d036d82bb
+  data.tar.gz: 3f29330cabf6abf2f0e96c81cefd3765560ae6224e41dfc59061473951c0e756
 SHA512:
-  metadata.gz: a8dc63658a0082778509d2da33b44e0e80573f1b0aef8fe76c05d816d34e9dd10084de81f38c37df20d6351a9b47b2a33836bbb4405a7143da028f82ef4e2558
-  data.tar.gz: 005bd7b55911a289cd33f521a3850c00ade3622cdce377a1f79e57958925cbc86216b266ffaa6a58a58fdcf66822c5eb34ea48240ff8d29d581f8f2469aa0551
+  metadata.gz: 85c04e5637cefcf677546c2dbd887126276499c88d1e3261080957177f6e2a8853694134e28733ff9d77268a7ba574ec498801bf5f0752d92b919b8d64884012
+  data.tar.gz: ba575044445b063bff0751aeddf42849de980604f43d69765b62a39764a13e7f46ea220bc08bbc6ecabc0cdadc0a287c2ade6b3e846a8a823a101a4674420692

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.10)
+    rsmp (0.1.11)
       async (~> 1.23.0)
       async-io (~> 1.27.1)
       colorize (~> 0.8.1)

data/config/site.yaml

@@ -12,13 +12,12 @@ rsmp_versions:
   - 3.1.4
 
 components:
-  A1:
+  C1:
     type: main
 
 watchdog_interval: 1
 watchdog_timeout: 2
-acknowledgement_timeout: 2
-store_messages: false
+acknowledgement_timeout: 1
 command_response_timeout: 1
 status_response_timeout: 1
 status_update_timeout: 1

data/config/supervisor.yaml

@@ -13,9 +13,6 @@ command_response_timeout: 1
 status_response_timeout: 1
 status_update_timeout: 1
 
-sites:
-  any:
-
 log:
   active: true
   color: true
@@ -28,6 +25,6 @@ log:
   direction: true
   level: false
   json: true
-  acknowledgements: true
-  watchdogs: true
+  acknowledgements: false
+  watchdogs: false
 

data/lib/rsmp/proxy.rb

@@ -178,9 +178,9 @@ module RSMP
       timeout = @settings["watchdog_timeout"]
       latest = @latest_watchdog_received + timeout
       left = latest - now
-      log "Check watchdog, time:#{timeout}, last:#{@latest_watchdog_received}, now: #{now}, latest:#{latest}, left #{left}, fail:#{left<0}", level: :debug
+      #log "Check watchdog, time:#{timeout}, last:#{@latest_watchdog_received}, now: #{now}, latest:#{latest}, left #{left}, fail:#{left<0}", level: :debug
       if left < 0
-        log "No Watchdog within #{timeout} seconds, received at #{@latest_watchdog_received}, now is #{now}, diff #{now-latest}", level: :error
+        log "No Watchdog within #{timeout} seconds", level: :error
         stop
         return true
       end

data/lib/rsmp/site.rb

@@ -39,9 +39,6 @@ module RSMP
         'site_ready_timeout' => 1,
         'reconnect_interval' => 0.1,
         'send_after_connect' => true,
-        'components' => {
-          'C1' => {}
-        }
       }
       if options[:site_settings]
         converted = options[:site_settings].map { |k,v| [k.to_s,v] }.to_h   #convert symbol keys to string keys

data/lib/rsmp/supervisor.rb

@@ -159,7 +159,7 @@ module RSMP
 
     def find_site site_id
       @proxies.each do |site|
-        return site if site.site_id == site_id
+        return site if site_id == :any || site.site_id == site_id
       end
       nil
     end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Emil Tin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async