rsmp 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ffe9f097053c9814ad119cbd6a01192cd20c02d3ca1fffa6269dbdf534f419b
-  data.tar.gz: 9848398d419a76f16fa8eb1f527d4c6b055b17886a5ee689b7607c891103d5a1
+  metadata.gz: c9a318474a865aca223c43e6bfe2bb2bf55a1e0a4584a7d28c80fc87295bc1f9
+  data.tar.gz: 64e892b4fe5b4dbd4aa910542634d82e9120f6c698eb57920c718657be200c1d
 SHA512:
-  metadata.gz: d974b915cbc32bee428cc7f39a1e26134c6db34f72590ad9bd67400ad71ce831037a82341601369aa6582c1e4b5ecf8d4e6f8c3249a4375716bc877ca1cc7cec
-  data.tar.gz: 301eb51aecb05c57fc3395f3a06df33846e24fdd863db2ff65e81e9fc1b7c23c4e6b40e508b15a3ec0c92e87595ce78317773cfca6e13ec72ca9609d037cb1f1
+  metadata.gz: 0c9cada8fb00a82666968a656e6896f35942ef480d0ee0e5a442be38b25cc20b89460c6317e13b3087a2c2e7b70432bd8dd69d33a010cca13685f100fc4c0aed
+  data.tar.gz: 305d823c21f5de5f32fc143fdc5d7ad0e2c7947940fd4b261e6dd94b222c58657173cacf14c7a4aae59b263eebb1d5d7060d1b0645a99cd414a76cc8d65d55e0

data/Gemfile.lock

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

data/config/supervisor.yaml

@@ -15,5 +15,3 @@ log:
   level: false
   debug: true
   json: true
-  acknowledgements: false
-  watchdogs: false

data/config/tlc.yaml

@@ -48,5 +48,3 @@ log:
   level: false
   debug: true
   json: true
-  acknowledgements: false
-  watchdogs: false

data/lib/rsmp/logger.rb

@@ -14,6 +14,7 @@ module RSMP
         'hide_ip_and_port' => false,
         'acknowledgements' => false,
         'watchdogs' => false,
+        'alarms' => true,
         'json'=>false,
         'tabs'=>'-',
 
@@ -44,6 +45,15 @@ module RSMP
         'id'=>4,
       }
 
+      @ignorable = {
+        'versions' => ['Version'],
+        'statuses' => ['StatusRequest','StatusSubscribe','StatusUnsubscribe','StatusResponse','StatusUpdate'],
+        'commands' => ['CommandRequest','CommandResponse'],
+        'watchdogs' => 'Watchdog',
+        'alarms' => ['Alarm','AlarmRequest'],
+        'aggregated_status' => ['AggregatedStatus','AggregatedStatusRequest']
+      }
+
       if settings
         @settings = defaults.merge settings
       else
@@ -96,10 +106,15 @@ module RSMP
       if item[:message]
         type = item[:message].type
         ack = type == "MessageAck" || type == "MessageNotAck"
-        if @settings["watchdogs"] == false
-          return false if type == "Watchdog"
-          if ack
-            return false if item[:message].original && item[:message].original.type == "Watchdog"
+        @ignorable.each_pair do |key,types|
+          next unless types
+          ignore = [types].flatten
+          if @settings[key] == false
+            #p [type,ignore_type, [ignore_type].flatten.include?(type)]
+            return false if ignore.include?(type)
+            if ack
+              return false if item[:message].original && ignore.include?(item[:message].original.type)
+            end
           end
         end
         return false if ack && @settings["acknowledgements"] == false && 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 end

metadata

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