tac_scribe 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6540479b0949db23d8dcbfc7965a716d4909b7e03b314f9b1687b7b7b044e1b
-  data.tar.gz: 9c6ee7a6e020b81eea6cd809c043eb31f2353256a41463da5349ee78699d3f1b
+  metadata.gz: 485c9e87c957fd0e66db7cc762a36283baa2c4852546008b2d4dbd5e2372a53a
+  data.tar.gz: 95576f042c7455ac1e5b87bcab21d6a5ff555d8f67a83b4c7cd2531b56f696c1
 SHA512:
-  metadata.gz: 5236421e641674570e47e65c309ed12c0beff782cfd7fddea75d09687a4aa7660a445cc5249e2d8489f4a56df2cba8ec9fd76df1390b916053cd35ab9dc19f84
-  data.tar.gz: 3a500080c5d44f78c1bfd0914face93c40d318eb8721d7a2e0876a7e5cfdc9cfdddded214fe0f99da2fbcb356420d1319159f085cbcbdd2d61eac3064afaf4c3
+  metadata.gz: 1aefe11c62a16ac70377bc48f262b699f2aebb4c38480bbe677b1490e5d14320c0e213d1976e0b4a477e1687e24b8bccae1b9a7f111bdaaeca1c0ebba63f9d62
+  data.tar.gz: 2d54201ba482399aafd29a4633b3b7361220457e85e8aae0447be8920191fc708e3582617affe5176d6bacd6682688c73e315772e094a71ada60af1101b6a2f5

data/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.5.0]
+### Changed
+- Added missing db column to migration file
+- Clear the cache on server restart
+- Add more info to logging
+
 ## [0.4.0]
 ### Changed
 - Switch to periodic writing to the database

data/data/whitelist.example

@@ -0,0 +1,5 @@
+Sea+Watercraft+AircraftCarrier
+Air+Rotorcraft
+Air+FixedWing
+Ground+Static+Aerodrome
+Navaid+Static+Bullseye

data/db/001_create_unit_table.rb

@@ -13,6 +13,7 @@ Sequel.migration do
       Integer :coalition
       Integer :heading
       Time :updated_at
+      Boolean :deleted
       # TODO: GIST Index on the position
     end
   end

data/lib/tac_scribe/cache.rb

@@ -75,6 +75,10 @@ module TacScribe
     def delete_object(id)
       @@cache[id][:deleted] = true if @@cache[id]
     end
+    
+    def clear
+      @@cache.clear
+    end
 
     private
 

data/lib/tac_scribe/daemon.rb

@@ -53,6 +53,7 @@ module TacScribe
         kill_threads
         @event_queue.clear
         Datastore.instance.truncate_table
+        Cache.instance.clear
         start_processing_threads
         start_db_sync_thread
         start_reporting_thread
@@ -79,13 +80,13 @@ module TacScribe
 
     def start_processing_threads
       @event_processor = EventProcessor.new(cache: Cache.instance,
-                             datastore: Datastore.instance,
-                             event_queue: @event_queue,
-                             whitelist: @whitelist)
+                                            datastore: Datastore.instance,
+                                            event_queue: @event_queue,
+                                            whitelist: @whitelist)
       event_processor_thread = Thread.new do
         @event_processor.start
       end
-      event_processor_thread.name = "Event Processor"
+      event_processor_thread.name = 'Event Processor'
       @threads << event_processor_thread
     end
 
@@ -97,7 +98,7 @@ module TacScribe
           deleted.each { |id| Cache.instance.data.delete(id) }
         end
       end
-      db_write_thread.name = "Database Writing"
+      db_write_thread.name = 'Database Writing'
       @threads << db_write_thread
     end
 
@@ -106,18 +107,22 @@ module TacScribe
 
       reporting_thread = Thread.new do
         loop do
-          puts "#{Time.now.strftime('%FT%T')}\t" + 
-               "Events Incoming: #{@event_queue.events_written}\t" +
-               "Processed: #{@event_processor.events_processed}\t" +
-               "Ignored: #{@event_processor.events_ignored}\t" +
-               "Queue Size: #{@event_queue.size}"
+          puts "#{Time.now.strftime('%FT%T')}\t" \
+               "Events Incoming: #{@event_queue.events_written}\t" \
+               "Processed: #{@event_processor.events_processed}\t" \
+               "Ignored: #{@event_processor.events_ignored}\t" \
+               "Queue Size: #{@event_queue.size}\t" \
+               "Objects Written: #{Datastore.instance.written}\t" \
+               "Deleted: #{Datastore.instance.deleted}"
           @event_queue.events_written = 0
           @event_processor.events_processed = 0
           @event_processor.events_ignored = 0
+          Datastore.instance.written = 0
+          Datastore.instance.deleted = 0
           sleep 1
         end
       end
-      reporting_thread.name = "Reporting"
+      reporting_thread.name = 'Reporting'
       @threads << reporting_thread
     end
 

data/lib/tac_scribe/datastore.rb

@@ -14,7 +14,7 @@ module TacScribe
     include Singleton
     include GeoRuby::SimpleFeatures
 
-    attr_accessor :db
+    attr_accessor :db, :written, :deleted
 
     @configuration = nil
     @db = nil
@@ -64,6 +64,9 @@ module TacScribe
                  .multi_insert(objects)
       deleted_ids = @db[:units].where(deleted: true).select_map(:id)
       @db[:units].where(deleted: true).delete
+      self.written = objects.size
+      self.deleted = deleted_ids.size
+
       deleted_ids
     end
 

data/lib/tac_scribe/event_processor.rb

@@ -82,7 +82,7 @@ module TacScribe
     def delete_object(id)
       if @@ignored_units.delete?(id)
         self.events_processed += 1
-        return
+        nil
       else
         self.events_processed += 1
         @cache.delete_object(id)

data/lib/tac_scribe/event_queue.rb

@@ -6,7 +6,6 @@ require 'time'
 module TacScribe
   # Processes the events emitted by the Ruby Tacview Client
   class EventQueue < TacviewClient::BaseProcessor
-
     attr_accessor :events_written
 
     def initialize
@@ -44,7 +43,7 @@ module TacScribe
     # @option event [BigDecimal] :altitude The object altitude above sea level
     #   in meters to 1 decimal place.
     def update_object(event)
-      self.events_written +=1
+      self.events_written += 1
       @events << { type: :update_object, event: event, time: @time }
     end
 
@@ -53,7 +52,7 @@ module TacScribe
     # @param object_id [String] A hexadecimal number representing the object
     #   ID
     def delete_object(object_id)
-      self.events_written +=1
+      self.events_written += 1
       @events << { type: :delete_object, object_id: object_id }
     end
 

data/lib/tac_scribe/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tac_scribe
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jeffrey Jones
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - bin/console
 - bin/setup
 - data/airfields.json
+- data/whitelist.example
 - db/001_create_unit_table.rb
 - db/README.md
 - exe/tac_scribe