my_gpsd_client 0.02.04 → 0.02.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be4f1c4c5206353cb073d29786bcf42843ad23fc79db633a52db546311c7f94d
-  data.tar.gz: d460dbb1f143ed168e897b61e957e071bf5ee050c54698b22c8cec2efa32e4c8
+  metadata.gz: cca72cd805fe4666ec09ab123acc03c901c815c6d02b5d35be1a413baf5ba167
+  data.tar.gz: 3e8c5649ed8a39cd03b2e0a2791159ce43f5f437fe089f7651f599e0edd6c606
 SHA512:
-  metadata.gz: f7fa5f1b82865b37d52c00e509ea4dc3dd2cc4f73d85f60dcd07d7ff9c77f137d21b2d04aa29dda38f34b82d18452ea054db7da73142390e792e53b82fb2a901
-  data.tar.gz: 506bcb5d6b8d151709a3419768940151d05add153719457d56cd84a69b40d44c21c074c8952e44dc734154b068eb768e935f97ed791cda1f30a625e462629d65
+  metadata.gz: 12ea53ddd4aaa482822d587d4825dc7049e824aa9b50e2022b808634e73e419a3093677c7462a863dda5012c3a6d1fd5a30436bf6ba76867dd423d833c9027b8
+  data.tar.gz: bbdaa19ca254d5d17368ab67d1d8b5d27337a115387410507a38096c89153e3a41dd954087608b12e1624698e9e58d75d714bdfc2c711bcd9623def20cc0e433

data/lib/my_gpsd_client.rb

@@ -5,7 +5,7 @@ require 'date'
 require 'logger'
 
 class MyGpsdClient
-  attr_accessor :host, :port, :command, :min_speed, :watchdog_max, :watchdog_force,
+  attr_accessor :host, :port, :command, :min_speed, :watchdog_max, :watchdog_force, :watchdog_euthanized
                 :log_progname, :log_level, :log_path, :log_format, :log_time_format
   attr_reader   :version, :last_watch, :socket_ready, :socket, :msg_counts, :watchdog_fired_count,
                 :readthread, :socket_init_thread, :watchdogthread, :watchdog_count
@@ -71,6 +71,7 @@ class MyGpsdClient
     @watchdog_max = DEFAULT_WATCHDOG_MAX
     @watchdog_fired_count = 0
     @watchdog_force = false
+    @watchdog_euthanized = false
     @min_speed = 0 # speed needs to be higher than this to make the gps info count
     @last = nil #last gps info
     @sats = nil # last satellites info
@@ -218,44 +219,48 @@ class MyGpsdClient
 
     #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     # background thread to implement a watchdog timer
-    my_logger  msg:  "Start: Starting Watchdog Thread"
-    @watchdogthread = Thread.start do
-      Thread.current[:name]=THREAD_NAMES[:WatchdogThread]
-      my_logger  msg:  "Watchdog Thread: #{Thread.current[:name]}"
-      @watchdog_count = 0.0
-      @watchdog_enabled = true
-      while @watchdog_enabled do
-        my_logger msg: "Watchdog Thread: Watchdog Tick"
-        if @watchdog_force
-          @watchdog_force = false
-          # force the watchdog to fire by killing the socket
-          @socket.close if @socket && !@socket.closed?
-          #@watchdog_count = @watchdog_max
-        end
-        if (@watchdog_count += WATCHDOG_STEP) >= @watchdog_max
-          my_logger level: 'warn', msg:  "Watchdog Fired"
-          @watchdog_count = 0.0
-          @watchdog_fired_count += 1
-          @watchdog_enabled = false
-          # Kill the readthread...
-          my_logger msg: "Watchdog Thread: Killing ReadThread"
-          Thread.kill(@readthread) if @readthread && @readthread.alive?
-          if @last_watch[:enable]
-            stop
-            sleep 0.5
-            my_logger msg: "Watchdog Thread: Send Last_Watch: #{@last_watch}"
-            @command = @last_watch
-            send_cmmd
-            my_logger msg: "Watchdog Thread: Thread.exit"
-            Thread.exit
-          else
-            close_socket
+    if @watchdog_euthanized
+      my_logger msg: "Watchdog has been euthanized!"
+    else
+      my_logger  msg:  "Start: Starting Watchdog Thread"
+      @watchdogthread = Thread.start do
+        Thread.current[:name]=THREAD_NAMES[:WatchdogThread]
+        my_logger  msg:  "Watchdog Thread: #{Thread.current[:name]}"
+        @watchdog_count = 0.0
+        @watchdog_enabled = true
+        while @watchdog_enabled && !@watchdog_euthanized do
+          my_logger msg: "Watchdog Thread: Watchdog Tick"
+          if @watchdog_force
+            @watchdog_force = false
+            # force the watchdog to fire by killing the socket
+            @socket.close if @socket && !@socket.closed?
+            #@watchdog_count = @watchdog_max
           end
-        end
-        sleep WATCHDOG_STEP
-      end   # while
-      my_logger msg: "Closing Watchdog Thread"
-    end   # watchdog thread
+          if (@watchdog_count += WATCHDOG_STEP) >= @watchdog_max
+            my_logger level: 'warn', msg:  "Watchdog Fired"
+            @watchdog_count = 0.0
+            @watchdog_fired_count += 1
+            @watchdog_enabled = false
+            # Kill the readthread...
+            my_logger msg: "Watchdog Thread: Killing ReadThread"
+            Thread.kill(@readthread) if @readthread && @readthread.alive?
+            if @last_watch[:enable]
+              stop
+              sleep 0.5
+              my_logger msg: "Watchdog Thread: Send Last_Watch: #{@last_watch}"
+              @command = @last_watch
+              send_cmmd
+              my_logger msg: "Watchdog Thread: Thread.exit"
+              Thread.exit
+            else
+              close_socket
+            end
+          end
+          sleep WATCHDOG_STEP
+        end   # while Wchdog enabled
+        my_logger msg: "Closing Watchdog Thread"
+      end # wtchdg thread start do
+    end   # watchdog euthanize if
     #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     my_logger  msg:  "Start: Exiting Start"

data/lib/my_gpsd_client/version.rb

@@ -1,3 +1,3 @@
 class MyGpsdClient_version
-  VERSION = "0.02.04"
+  VERSION = "0.02.05"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_gpsd_client
 version: !ruby/object:Gem::Version
-  version: 0.02.04
+  version: 0.02.05
 platform: ruby
 authors:
 - Steven Finnegan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler