tac_scribe 0.2.0-java → 0.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e9df45f82c6c95147899eb06561c0d4a6f250585500dd7ac772e40c29f51b1
-  data.tar.gz: 9f40713098afbe71d7ccd486e8a0913b5f7245744c5b3a87753401bbd8c5596c
+  metadata.gz: ad06d7c2f742a8d35c641bf120a6f95391902ea57719669cc53cd80186a14493
+  data.tar.gz: e35b648c32b18fe4628ee4a3a46adb6a378f2639d2e85a9cd6743b5d57624f7d
 SHA512:
-  metadata.gz: 148a8beed1d393b3ab8fb5a7e310e7aa913e0b3de237093681beb66f6a74f85c60292cdfed2a4ab439a6df4b158eb0cfb84611ed7582b68261481185e52504a1
-  data.tar.gz: be3183bf59c00cfa169431c383f282838acdf572ae9b7ac3fd425088b9a9c1d7c93610252c367041d3e3adb9768746c04a530a6a55040ccd9f200fcbfbdb72e5
+  metadata.gz: 9a0fb2a75b2d1c66ff44aca4bbcdb3bf905032c20f631230c4491cfc8c696de3059b947e89c245b30c624d6c89a37f20bb9f24a38e0acc876bfefb409b04a442
+  data.tar.gz: 3502da2ea575e6a40a87599c2a117ccdbf12417b59feef9dd92628c9f56c46a1b642795203437d7b81321eda4c4c64e67e23d5203cb8ec4cf1c63bf6529c5f97

data/.ruby-version

@@ -1 +1 @@
-jruby-9.2.6.0
+ruby-2.6.3

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.1] - 2019-10-13
+### Changed
+- Added separate events in / events out for the queue logging
+
 ## [0.2.0] - 2019-10-13
 ### Added
 - JRuby support

data/lib/tac_scribe/daemon.rb

@@ -46,7 +46,7 @@ module TacScribe
     def start_processing
       loop do
         kill_processing_threads
-        @event_queue.events.clear
+        @event_queue.clear
         Datastore.instance.truncate_table
         start_processing_threads
         populate_airfields if @populate_airfields

data/lib/tac_scribe/event_processor.rb

@@ -14,7 +14,7 @@ module TacScribe
 
     def start
       loop do
-        wrapped_event = @event_queue.events.shift
+        wrapped_event = @event_queue.get_event
         process_event(wrapped_event)
       rescue StandardError => e
         puts wrapped_event

data/lib/tac_scribe/event_queue.rb

@@ -6,24 +6,35 @@ require 'time'
 module TacScribe
   # Processes the events emitted by the Ruby Tacview Client
   class EventQueue < TacviewClient::BaseProcessor
-    attr_accessor :events, :reference_latitude, :reference_longitude
+    attr_accessor :reference_latitude, :reference_longitude
 
     def initialize(verbose_logging:)
       @verbose_logging = verbose_logging
       @events = Queue.new
-      @event_count = 0
+      @event_write = 0
+      @event_read = 0
 
       return unless verbose_logging == true
 
       Thread.new do
         loop do
-          puts "#{Time.now.strftime("%FT%T")} - Queue Size: #{@events.size} \t Events Processed: #{@event_count}"
-          @event_count = 0
+          puts "#{Time.now.strftime("%FT%T")} - Queue Size: #{@events.size} \t Events Added: #{@event_write} \t Events Processed: #{@event_read}"
+          @event_write = 0
+          @event_read = 0
           sleep 1
         end
       end
     end
 
+    def clear
+      @events.clear
+    end
+
+    def get_event
+      @event_read += 1
+      @events.shift
+    end
+
     # Process an update event for an object
     #
     # On the first appearance of the object there are usually more fields
@@ -42,8 +53,8 @@ module TacScribe
     # @option event [BigDecimal] :altitude The object altitude above sea level
     #   in meters to 1 decimal place.
     def update_object(event)
-      @event_count += 1
-      events << { type: :update_object, event: event, time: @time }
+      @event_write += 1
+      @events << { type: :update_object, event: event, time: @time }
     end
 
     # Process a delete event for an object
@@ -51,8 +62,8 @@ module TacScribe
     # @param object_id [String] A hexadecimal number representing the object
     #   ID
     def delete_object(object_id)
-      @event_count += 1
-      events << { type: :delete_object, object_id: object_id }
+      @event_write += 1
+      @events << { type: :delete_object, object_id: object_id }
     end
 
     # Process a time update event

data/lib/tac_scribe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TacScribe
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tac_scribe
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: java
 authors:
 - Jeffrey Jones