my_gpsd_client 0.02.03 → 0.02.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb1eb0758c13fb908e9ac239ba2e84f1ddbe23507400bbfc4774eb9c529ef06
-  data.tar.gz: f69f14b3c0cc30e8827fb97076eb067fc12131950bd859f15ece5bcad1299c33
+  metadata.gz: be4f1c4c5206353cb073d29786bcf42843ad23fc79db633a52db546311c7f94d
+  data.tar.gz: d460dbb1f143ed168e897b61e957e071bf5ee050c54698b22c8cec2efa32e4c8
 SHA512:
-  metadata.gz: e8521af40063d27ae44db6f4f0ffa3a56bf4da309f0efb0d03e883229ae3554ea695964aad9177fce7b9da4fcd050f2f00ff52e2de0c9ad103ef7044af3e35a3
-  data.tar.gz: 94037574dd6f7e6a07e33bc52b8908d1abddb4879bc8bbb70f9b762d49d2e0223ed113c433908948e0578802c0b7106ef219d46f10fe37ac9dd812eae2cf4007
+  metadata.gz: f7fa5f1b82865b37d52c00e509ea4dc3dd2cc4f73d85f60dcd07d7ff9c77f137d21b2d04aa29dda38f34b82d18452ea054db7da73142390e792e53b82fb2a901
+  data.tar.gz: 506bcb5d6b8d151709a3419768940151d05add153719457d56cd84a69b40d44c21c074c8952e44dc734154b068eb768e935f97ed791cda1f30a625e462629d65

data/lib/my_gpsd_client.rb

@@ -5,14 +5,23 @@ require 'date'
 require 'logger'
 
 class MyGpsdClient
-  attr_accessor :host, :port, :command, :log_level, :min_speed, :watchdog_max, :watchdog_force
-  attr_reader :version, :last_watch, :socket_ready, :msg_counts, :watchdog_fired_count
+  attr_accessor :host, :port, :command, :min_speed, :watchdog_max, :watchdog_force,
+                :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
+
 
   DEFAULT_HOST = 'localhost'
   DEFAULT_PORT = 2947
-  DEFAULT_WATCH = {"enable":false,"json":false,"nmea":false}
-  DEFAULT_LOG_LEVEL = 0
+  DEFAULT_WATCH = {"class":"WATCH", "enable":false,"json":false,"nmea":false}
   DEFAULT_WATCHDOG_MAX = 5.0
+
+  DEFAULT_LOG_PROGNAME = "MyGpsdClient"
+  DEFAULT_LOG_LEVEL = Logger::DEBUG
+  DEFAULT_LOG_PATH = 'log/MyGpsdClient.log'
+  DEFAULT_LOG_FORMAT = ''
+  DEFAULT_LOG_TIME_FORMAT = '%Y-%m-%d %T.%N %z %Z'
+
   WATCHDOG_STEP = 0.1 # Check watchdog ten times per second
 
   THREAD_NAMES = {    # Keep displayed names the same length
@@ -23,6 +32,8 @@ class MyGpsdClient
    }
   Thread.current[:name]=THREAD_NAMES[:MainThread]
 
+  @@logger = nil
+
 
   # A simple gpsd client that dump's json objects contianing all info received from the gpsd deamon
   # you need to at least setup either the raw callback (on_raw_change) or position callback (on_position_change) to use GPSD2JSON. the raw callback just passes the json objects it received from the daemon on to the block you pass it. the on_position_change and on_satellites_change are a bit easier to use.
@@ -44,7 +55,12 @@ class MyGpsdClient
     @host = host
     @port = port
     @last_watch = watch
+
     @log_level = log_level
+    @log_path = DEFAULT_LOG_PATH
+    @log_format = DEFAULT_LOG_FORMAT
+    @log_time_format = DEFAULT_LOG_TIME_FORMAT
+    @log_progname = DEFAULT_LOG_PROGNAME
 
     @socket = nil
     @socket_ready = false
@@ -68,13 +84,12 @@ class MyGpsdClient
                   toff: 0, pol: 0, pps: 0, dev: 0, devs: 0, err: 0,
                   unk: 0}
 
-    MyGpsdClient.logger.progname = MyGpsdClient
-    MyGpsdClient.logger.level = @log_level
+    @logger = new_logger path: @log_path, progname: @log_progname, time_format: @log_time_format, level: @log_level
     my_logger level: 'info', msg: "MyGpsdClient Gem - Version: #{@version}"
   end
 
   #
-  # Receive Commands from User
+  # attribute_writters additional actions
   #
   def command=(val)
     @command = val
@@ -85,9 +100,34 @@ class MyGpsdClient
 
   def log_level=(val)
     @log_level = val
-    MyGpsdClient.logger.level = @log_level
+    @logger.level = @log_level
+  end
+
+  def log_progname=(val)
+    @log_progname = val
+    @logger.progname = @log_progname
+  end
+
+  def log_format=(val)
+    @log_format = val
+    @logger.format = @log_format
+  end
+
+  def log_time_format=(val)
+    @log_time_format = val
+    @logger.datetime_format = @log_time_format
   end
 
+  def log_path=(val)
+    @log_path = val
+    @logger = new_logger path: @log_path, progname: @log_progname, time_format: @log_time_format, level: @log_level
+  end
+  #
+  # End attribute_writters additional actions
+  #
+
+
+
   def log_marker level: 'debug', msg: "Log Marker"
     my_logger level: level, msg: "~~~~~~~~~~~~~~~~~~~~~~~ #{msg} ~~~~~~~~~~~~~~~~~~~~~~~"
   end
@@ -185,6 +225,7 @@ class MyGpsdClient
       @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
@@ -452,16 +493,28 @@ LOG_LEVELS = {debug: Logger::DEBUG, info: Logger::INFO, warn: Logger::WARN,
       error: Logger::ERROR, fatal: Logger::FATAL, unknown: Logger::UNKNOWN}
 
   def my_logger(level: 'debug', msg: "Blank")
-    MyGpsdClient.logger.add (LOG_LEVELS[level.to_sym]) {"#{Thread.current[:name]} -- #{msg}"}
+    @logger.add (LOG_LEVELS[level.to_sym]) {"#{Thread.current[:name]} -- #{msg}"}
   end
 
+  def new_logger( progname: nil, path:, format: nil, time_format: nil, level:  LOG_LEVELS[:debug])
+    logger = Logger.new(path)
+    logger.progname = progname if progname
+    logger.format = format if format
+    logger.level = level if level
+    logger.datetime_format = time_format if time_format
+    logger
+  end
+
+=begin
   def self.logger
+    puts "In self.logger: log_path => #{@log_path}, @@logger.nil? => #{@@logger.nil?}"
     @@logger ||= defined?(Rails) ? Rails.logger : Logger.new("log/MyGpsdClient.log")
+    puts "Exiting self.logger: @@logger => #{@@logger}"
   end
 
   def self.logger=(logger)
     @@logger = logger
   end
-
+=end
 
 end

data/lib/my_gpsd_client/version.rb

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

metadata

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