rsmp 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4072d3e93ef2223bfc9ac2cb1a1e34b3668456e52a622a2b6f059087dd442c2e
-  data.tar.gz: 37603275646789fec0db5ec4c85baf731bebe6786693e6ad57eae7be3b3c29ed
+  metadata.gz: 33b8c859b9c8450af6a45d52a9d42d982c5becdaf1d4424f398b417bc1c387d8
+  data.tar.gz: 7f194bb392a69555f7ba30364466dfed9eeb1b04996505fa13af13d9045bb071
 SHA512:
-  metadata.gz: 84a5e06ed20c8cb3331cf13ebd9bfc8d2baaf6c81ec14d67e83900d198153d86b89aeb09485f87afa9ef5c2aa7ca4469caa190a745dc9936caedc31bbb14d5a5
-  data.tar.gz: 9aa602447f391353632bf59fccd2ca48ab2eea492913cab875614c50279c362f04ebbf89559d1ea6a72878ef22e632a29160379b682356e8411568710a9d8525
+  metadata.gz: 2d9da45e5f1a96756cd50f58ea3ce16dc0de51138daa45aa114f432e0531595883c5cf3dba86ad63dd0a33aed7ba02d706f058378c257129a8b877eb45e2246b
+  data.tar.gz: 59965992a0e7bcdd6e401fac5baa2e8839c392713812da579865020d6cf5d9cf73d51b250f9be72cab3264fd5a9edd287e85619e2ebab0259fb303da9cfe25ff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.6.3)
+    rsmp (0.6.4)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)

data/README.md

@@ -125,7 +125,7 @@ This will output messages form both the site and the supervisor, ordered chronol
 ```console
 RN+SU0001                              Starting supervisor RN+SU0001 on port 12111
 RN+SI0001                              Starting site RN+SI0001
-RN+SI0001                              Connecting to superviser at 127.0.0.1:12111
+RN+SI0001                              Connecting to supervisor at 127.0.0.1:12111
 RN+SI0001                   <--  f8c7  Sent Version
 RN+SU0001                              Site connected from 127.0.0.1:53500
 RN+SU0001     RN+SI0001     -->  f8c7  Received Version message for sites [RN+SI0001] using RSMP 3.1.4
@@ -156,7 +156,7 @@ The ```site``` command will start an RSMP site, which will try to connect to one
 ```console
 % rsmp site
 2019-11-11 12:22:00 UTC                            Starting site RN+SI0001
-2019-11-11 12:22:00 UTC                            Connecting to superviser at 127.0.0.1:12111
+2019-11-11 12:22:00 UTC                            Connecting to supervisor at 127.0.0.1:12111
 2019-11-11 12:22:00 UTC                 <--  792f  Sent Version
 2019-11-11 12:22:00 UTC  RN+SU0001      -->  e70e  Received Version message, using RSMP 3.1.4
 2019-11-11 12:22:00 UTC  RN+SU0001                 Connection to supervisor established

data/lib/rsmp/logger.rb

@@ -24,6 +24,7 @@ module RSMP
         'ip'=>false,
         'port'=>false,
         'site_id'=>true,
+        'component'=>true,
         'direction'=>false,
         'level'=>false,
         'id'=>true,

data/lib/rsmp/supervisor_proxy.rb

@@ -23,15 +23,22 @@ module RSMP
     end
 
     def start
-      log "Connecting to superviser at #{@ip}:#{@port}", level: :info
+      log "Connecting to supervisor at #{@ip}:#{@port}", level: :info
       super
       connect
       @logger.unmute @ip, @port
-      log "Connected to superviser at #{@ip}:#{@port}", level: :info
+      log "Connected to supervisor at #{@ip}:#{@port}", level: :info
       start_reader
       send_version @site_settings['site_id'], @site_settings["rsmp_versions"]
-    rescue Errno::ECONNREFUSED
-      log "No connection to supervisor at #{@ip}:#{@port}", level: :error
+    rescue SystemCallError => e
+      log "Could not connect to supervisor at #{@ip}:#{@port}: Errno #{e.errno} #{e}", level: :error
+      retry_notice
+    rescue StandardError => e
+      log "Error while connecting to supervisor at #{@ip}:#{@port}: #{e}", level: :error
+      retry_notice
+    end
+
+    def retry_notice
       unless @site.site_settings['intervals']['reconnect'] == :no
         log "Will try to reconnect again every #{@site.site_settings['intervals']['reconnect']} seconds..", level: :info
         @logger.mute @ip, @port

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Emil Tin