tac_scribe 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbfc0be279d9733cd25267ab92c6becbf892281fb24900093e05d3b85c624777
-  data.tar.gz: 56a214ae80a0c7d1bfc52183a02bb3e0529eaf076648d04e1b63ae6f20f804f5
+  metadata.gz: ce5b7248567a8bc81d58e522a17d8b70b5d424d32d3d3871574316e6c695ecd5
+  data.tar.gz: d625536b54fe3dfddb476d75174f729e7fc05f7f19036ce386efef23123a233b
 SHA512:
-  metadata.gz: 5c5cfc5ad13980e00c54cf39ce499fdc77733454be1499594a55e4acfac42b9f4ea738c4f05144a3db21778eb71c8747c7d1813771e808684b8048c4564b71d5
-  data.tar.gz: 643fc7c958b7d2e5452651700d83ca677e8b56987bcd6a253697ccd39f9d1ef774e6971486acea9f2b97960d67616e911dd34e801f5a3377a8f6700d0720e06f
+  metadata.gz: 43bc7158a47eebf3c4edbcd66f0e044615a08ff0c97d369d66058fd43eff44f293af7f896d02d21473827968e371b526c6372387f573ef23432131176640f112
+  data.tar.gz: 6f2232bee8af4f1db47caf6dc03a610a7550a3436646ac72d32982a1158cc4e0f5944d98fc4555b7ef0b97cf17fd56ee2091f5c854d2a57701eb2f60bf67e093

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

data/tac_scribe.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
 
   if RUBY_PLATFORM == 'java'
     # TODO: Specifying a verison chokes bundler for some reason
+    spec.platform = 'java'
     spec.add_dependency 'activerecord-jdbcpostgresql-adapter'
   else
     spec.add_dependency 'pg', '~>1.1'

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: ruby
 authors:
 - Jeffrey Jones