openc3 5.3.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 883789b740b96ae3fac34c78b5a643a2fa1fb087d601a0f87c46d0062eec3dec
-  data.tar.gz: 510b9f4c8f98735f033f6dd6d31ebd86ffaeb8df0664d77720e15a3df3df6dcb
+  metadata.gz: ba92696b60117db745207ad94efe543da2db11f25212f70269a6305cb8445295
+  data.tar.gz: ac3d2cc21a962434b478f708644bb33b702858c770a4c93c0017529bcb5b7b05
 SHA512:
-  metadata.gz: 999476145415b7f6b160319fee0f67174ad2cdf415ef3a87628177964e37bf690e5c368bf3da9c6a08ca663679999b71b3e7d4c176c2a302724073b7c5c8faca
-  data.tar.gz: 206852353795f779b2d8481f68bcf881c465ceaf3c6a48b852a61dab34275b7736249def97edd7932e7fa9286d71f07f210ca340c0363dbce30839504d548640
+  metadata.gz: cca2d57593526f75888406d0b7946f22ce53823d6e2a45e5204a0856948b6b752b9a7a9612f417d973a6a50c55bf46b16800f4e9295cbeb451d48600d1ae71d0
+  data.tar.gz: 37cb6cf7247cc6956172641d95755145e409ef09ee35dc08d7bae7650e422961c7d17caf83ee7affb428da84057a94625c4484e5b11165bf50db7d692d72a0f2

data/bin/openc3cli

@@ -322,14 +322,14 @@ ensure
   exit(result)
 end
 
-def update_plugin(plugin_file_path, plugin_name, variables: nil, plugin_txt_lines: nil, scope:, existing_plugin_name:)
+def update_plugin(plugin_file_path, plugin_name, variables: nil, plugin_txt_lines: nil, scope:, existing_plugin_name:, force: false)
   new_gem = File.basename(plugin_file_path)
   old_gem = existing_plugin_name.split("__")[0]
   puts "Updating existing plugin: #{existing_plugin_name} with #{File.basename(plugin_file_path)}"
   plugin_model = OpenC3::PluginModel.get_model(name: existing_plugin_name, scope: scope)
   begin
     # Only update if something has changed
-    if (new_gem != old_gem) or (variables and variables != plugin_model.variables) or (plugin_txt_lines and plugin_txt_lines != plugin_model.plugin_txt_lines)
+    if force or (new_gem != old_gem) or (variables and variables != plugin_model.variables) or (plugin_txt_lines and plugin_txt_lines != plugin_model.plugin_txt_lines)
       puts "Gem version change detected - New: #{new_gem}, Old: #{old_gem}" if new_gem != old_gem
       if variables and variables != plugin_model.variables
         pp_variables = ""
@@ -360,7 +360,7 @@ end
 # This code is used from the command line and is the same code that gets called if you
 # edit/upgrade or install a new plugin from the Admin interface
 #
-# Usage: cli load gemfile_path [scope] [plugin_hash_file_path]
+# Usage: cli load gemfile_path [scope] [plugin_hash_file_path] [force]
 #
 # With just gemfile_path and/or scope: Will do nothing if any plugin
 # with the same gem file already exists
@@ -370,7 +370,10 @@ end
 # Otherwise, it will be assumed that the plugin is intentionally being installed for a second
 # time
 #
-def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil)
+# Pass true as the last argument to force install even if a plugin with
+# the same version number exists
+#
+def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil, force: false)
   scope ||= 'DEFAULT'
   # Only create the scope if it doesn't already exist
   unless OpenC3::ScopeModel.names.include?(scope)
@@ -403,7 +406,7 @@ def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil)
           found = true
           # Upgrade if version changed else do nothing
           if file_full_name != full_name
-            update_plugin(plugin_file_path, plugin_name, scope: scope, existing_plugin_name: plugin_name)
+            update_plugin(plugin_file_path, plugin_name, scope: scope, existing_plugin_name: plugin_name, force: force)
           else
             puts "No version change detected for: #{plugin_name}"
           end
@@ -430,15 +433,16 @@ def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil)
 
     if existing_plugin_hash
       # Upgrade or Edit
-      update_plugin(plugin_file_path, plugin_hash['name'], variables: plugin_hash['variables'], plugin_txt_lines: plugin_hash['plugin_txt_lines'], scope: scope, existing_plugin_name: existing_plugin_hash['name'])
+      update_plugin(plugin_file_path, plugin_hash['name'], variables: plugin_hash['variables'], scope: scope,
+        plugin_txt_lines: plugin_hash['plugin_txt_lines'], existing_plugin_name: existing_plugin_hash['name'], force: force)
     else
       # New Install
       puts "Loading new plugin: #{plugin_file_path}\n#{plugin_hash}"
       plugin_hash = OpenC3::PluginModel.install_phase2(plugin_hash, scope: scope)
       OpenC3::LocalMode.update_local_plugin(plugin_file_path, plugin_hash, scope: scope)
     end
-  rescue => err
-    abort("Error installing plugin: #{scope}: #{plugin_file_path}: #{err.formatted}")
+  rescue => error
+    abort("Error installing plugin: #{scope}: #{plugin_file_path}\n#{error.message}")
   end
 end
 
@@ -517,129 +521,128 @@ def run_migrations(folder)
   end
 end
 
-if __FILE__ == $0
-  if not ARGV[0].nil? # argument(s) given
+if not ARGV[0].nil? # argument(s) given
 
-    # Handle each task
-    case ARGV[0].downcase
+  # Handle each task
+  case ARGV[0].downcase
 
-    when 'rake'
-      puts `rake #{ARGV[1..-1].join(' ')}`
+  when 'rake'
+    puts `rake #{ARGV[1..-1].join(' ')}`
 
-    when 'validate'
-      validate_plugin(ARGV[1], scope: ARGV[2], variables_file: ARGV[3])
+  when 'validate'
+    validate_plugin(ARGV[1], scope: ARGV[2], variables_file: ARGV[3])
 
-    when 'load'
-      load_plugin(ARGV[1], scope: ARGV[2], plugin_hash_file: ARGV[3])
+  when 'load'
+    # force is a boolean so if they pass 'force' it is true
+    # See plugins_controller.rb install for usage
+    load_plugin(ARGV[1], scope: ARGV[2], plugin_hash_file: ARGV[3], force: ARGV[4] == 'force')
 
-    when 'unload'
-      unload_plugin(ARGV[1], scope: ARGV[2])
+  when 'unload'
+    unload_plugin(ARGV[1], scope: ARGV[2])
 
-    when 'geminstall'
-      gem_install(ARGV[1], scope: ARGV[2])
+  when 'geminstall'
+    gem_install(ARGV[1], scope: ARGV[2])
 
-    when 'generate'
-      generate(ARGV[1..-1])
+  when 'generate'
+    generate(ARGV[1..-1])
 
-    when 'migrate'
-      migrate(ARGV[1..-1])
+  when 'migrate'
+    migrate(ARGV[1..-1])
 
-    when 'rubysloc'
-      puts `ruby /openc3/bin/rubysloc #{ARGV[1..-1].join(' ')}`
+  when 'rubysloc'
+    puts `ruby /openc3/bin/rubysloc #{ARGV[1..-1].join(' ')}`
 
-    when 'cstol_converter'
-      puts `ruby /openc3/bin/cstol_converter #{ARGV[1..-1].join(' ')}`
+  when 'cstol_converter'
+    puts `ruby /openc3/bin/cstol_converter #{ARGV[1..-1].join(' ')}`
 
-    when 'xtce_converter'
-      xtce_converter(ARGV[1..-1])
+  when 'xtce_converter'
+    xtce_converter(ARGV[1..-1])
 
-    when 'bridge'
-      ENV['OPENC3_NO_STORE'] = '1'
-      filename = ARGV[1]
-      filename = 'bridge.txt' unless filename
-      bridge = OpenC3::Bridge.new(filename)
-      begin
-        while true
-          sleep(1)
-        end
-      rescue Interrupt
-        exit(0)
+  when 'bridge'
+    ENV['OPENC3_NO_STORE'] = '1'
+    filename = ARGV[1]
+    filename = 'bridge.txt' unless filename
+    bridge = OpenC3::Bridge.new(filename)
+    begin
+      while true
+        sleep(1)
       end
+    rescue Interrupt
+      exit(0)
+    end
 
-    when 'bridgesetup'
-      ENV['OPENC3_NO_STORE'] = '1'
-      filename = ARGV[1]
-      filename = 'bridge.txt' unless filename
-      unless File.exist?(filename)
-        OpenC3::BridgeConfig.generate_default(filename)
-      end
+  when 'bridgesetup'
+    ENV['OPENC3_NO_STORE'] = '1'
+    filename = ARGV[1]
+    filename = 'bridge.txt' unless filename
+    unless File.exist?(filename)
+      OpenC3::BridgeConfig.generate_default(filename)
+    end
 
-    when 'help'
-      print_usage()
-
-    when 'redis'
-      case (ARGV[1])
-      when 'keys'
-        get_redis_keys()
-      when 'hget'
-        redis = Redis.new(url: $redis_url, username: ENV['OPENC3_REDIS_USERNAME'], password: ENV['OPENC3_REDIS_PASSWORD'])
-        puts JSON.parse(redis.hget(ARGV[2], ARGV[3]), :allow_nan => true, :create_additions => true)
-      else
-        puts "Unknown redis task: #{ARGV[1]}\n"
-        puts "Valid redis tasks: keys, hget"
-      end
+  when 'help'
+    print_usage()
 
-    when 'removebase'
-      # Used to remove tool base to better support enterprise upgrade
-      scopes = OpenC3::ScopeModel.all
-      scopes.each do |scope_name, scope|
-        plugins = OpenC3::PluginModel.all(scope: scope_name)
-        plugins.each do |plugin_name, plugin|
-          if plugin["name"] =~ /tool-base/ and plugin["name"] !~ /enterprise/
-            unload_plugin(plugin_name, scope: scope_name)
-          end
-          if plugin["name"] =~ /tool-admin/ and plugin["name"] !~ /enterprise/
-            unload_plugin(plugin_name, scope: scope_name)
-          end
+  when 'redis'
+    case (ARGV[1])
+    when 'keys'
+      get_redis_keys()
+    when 'hget'
+      redis = Redis.new(url: $redis_url, username: ENV['OPENC3_REDIS_USERNAME'], password: ENV['OPENC3_REDIS_PASSWORD'])
+      puts JSON.parse(redis.hget(ARGV[2], ARGV[3]), :allow_nan => true, :create_additions => true)
+    else
+      puts "Unknown redis task: #{ARGV[1]}\n"
+      puts "Valid redis tasks: keys, hget"
+    end
+
+  when 'removebase'
+    # Used to remove tool base to better support enterprise upgrade
+    scopes = OpenC3::ScopeModel.all
+    scopes.each do |scope_name, scope|
+      plugins = OpenC3::PluginModel.all(scope: scope_name)
+      plugins.each do |plugin_name, plugin|
+        if plugin["name"] =~ /tool-base/ and plugin["name"] !~ /enterprise/
+          unload_plugin(plugin_name, scope: scope_name)
+        end
+        if plugin["name"] =~ /tool-admin/ and plugin["name"] !~ /enterprise/
+          unload_plugin(plugin_name, scope: scope_name)
         end
       end
+    end
 
-    when 'removeenterprise'
-      # Used to remove enterprise plugins to better support downgrade
-      scopes = OpenC3::ScopeModel.all
-      scopes.each do |scope_name, scope|
-        plugins = OpenC3::PluginModel.all(scope: scope_name)
-        plugins.each do |plugin_name, plugin|
-          if plugin["name"] =~ /enterprise/
-            unload_plugin(plugin_name, scope: scope_name)
-          end
+  when 'removeenterprise'
+    # Used to remove enterprise plugins to better support downgrade
+    scopes = OpenC3::ScopeModel.all
+    scopes.each do |scope_name, scope|
+      plugins = OpenC3::PluginModel.all(scope: scope_name)
+      plugins.each do |plugin_name, plugin|
+        if plugin["name"] =~ /enterprise/
+          unload_plugin(plugin_name, scope: scope_name)
         end
       end
+    end
 
-    when 'destroyscope'
-      scope = OpenC3::ScopeModel.get_model(name: ARGV[1])
-      scope.destroy
+  when 'destroyscope'
+    scope = OpenC3::ScopeModel.get_model(name: ARGV[1])
+    scope.destroy
 
-    when 'localinit'
-      OpenC3::LocalMode.local_init()
+  when 'localinit'
+    OpenC3::LocalMode.local_init()
 
-    when 'initbuckets'
-      client = OpenC3::Bucket.getClient()
-      client.create(ENV['OPENC3_CONFIG_BUCKET'])
-      client.create(ENV['OPENC3_LOGS_BUCKET'])
-      client.create(ENV['OPENC3_TOOLS_BUCKET'])
-      client.ensure_public(ENV['OPENC3_TOOLS_BUCKET'])
+  when 'initbuckets'
+    client = OpenC3::Bucket.getClient()
+    client.create(ENV['OPENC3_CONFIG_BUCKET'])
+    client.create(ENV['OPENC3_LOGS_BUCKET'])
+    client.create(ENV['OPENC3_TOOLS_BUCKET'])
+    client.ensure_public(ENV['OPENC3_TOOLS_BUCKET'])
 
-    when 'runmigrations'
-      run_migrations(ARGV[1])
+  when 'runmigrations'
+    run_migrations(ARGV[1])
 
-    else # Unknown task
-      print_usage()
-      abort("Unknown task: #{ARGV[0]}")
-    end
-
-  else # No arguments given
+  else # Unknown task
     print_usage()
+    abort("Unknown task: #{ARGV[0]}")
   end
 
-end
+else # No arguments given
+  print_usage()
+end

data/data/config/item_modifiers.yaml

@@ -5,11 +5,13 @@ STATE:
   description: Key value pairs allow for user friendly strings. For example,
     you might define states for ON = 1 and OFF = 0. This allows the word ON to be
     used rather than the number 1 when sending the telemetry item and allows
-    for much greater clarity and less chance for user error.
+    for much greater clarity and less chance for user error. A catch all value
+    of ANY applies to all other values not already defined as state values.
   example: |
     APPEND_ITEM ENABLE 32 UINT "Enable setting"
       STATE FALSE 0
       STATE TRUE 1
+      STATE ERROR ANY # Match all other values to ERROR
     APPEND_ITEM STRING 1024 STRING "String"
       STATE "NOOP" "NOOP" GREEN
       STATE "ARM LASER" "ARM LASER" YELLOW
@@ -21,7 +23,7 @@ STATE:
       values: .*
     - name: Value
       required: true
-      description: The numerical state value
+      description: The numerical state value or ANY to apply the state to all other values
       values: .*
     - name: Color
       required: false

data/data/config/table_manager.yaml

@@ -80,8 +80,8 @@ SELECT_TABLE:
       description: The name of the existin table
       values: .*
 DEFAULT:
-  summary: Specify default values for a SINGLE row in a multi-column table.
-    If you have multiple rows you need a DEFAULT line for each row.
+  summary: Specify default values for a SINGLE row in a multi-column table
+  description: If you have multiple rows you need a DEFAULT line for each row.
     If all your rows are identical consider using ERB as shown in the OpenC3 demo.
   parameters:
     - name: Default values

data/data/config/tool.yaml

@@ -47,7 +47,7 @@ TOOL:
           values: .+
     CATEGORY:
       summary: Category for the tool
-      description: Associates the tool with a category. In a future release this will be able to organize tools into submenus in the Navigation menu.
+      description: Associates the tool with a category which becomes a submenu in the Navigation menu.
       parameters:
         - name: Category Name
           required: true

data/ext/openc3/ext/config_parser/config_parser.c

@@ -41,6 +41,7 @@ static ID id_method_scan = 0;
 static ID id_method_strip = 0;
 static ID id_method_to_s = 0;
 static ID id_method_upcase = 0;
+static ID id_method_parse_errors = 0;
 
 /*
  * Removes quotes from the given string if present.
@@ -103,6 +104,7 @@ static VALUE parse_loop(VALUE self, VALUE io, VALUE yield_non_keyword_lines, VAL
   volatile VALUE ivar_keyword = Qnil;
   volatile VALUE ivar_parameters = rb_ary_new();
   volatile VALUE ivar_line = rb_str_new2("");
+  volatile VALUE errors = rb_ary_new();
 
   rb_ivar_set(self, id_ivar_line_number, INT2FIX(0));
   rb_ivar_set(self, id_ivar_keyword, ivar_keyword);
@@ -205,7 +207,12 @@ static VALUE parse_loop(VALUE self, VALUE io, VALUE yield_non_keyword_lines, VAL
         rb_ary_clear(array);
         rb_ary_push(array, ivar_keyword);
         rb_ary_push(array, ivar_parameters);
-        rb_yield(array);
+        line = rb_protect(rb_yield, array, &result);
+        if (result)
+        {
+          rb_ary_push(errors, rb_errinfo());
+          rb_set_errinfo(Qnil);
+        }
       }
       ivar_line = rb_str_new2("");
       rb_ivar_set(self, id_ivar_line, ivar_line);
@@ -247,11 +254,18 @@ static VALUE parse_loop(VALUE self, VALUE io, VALUE yield_non_keyword_lines, VAL
     rb_ary_clear(array);
     rb_ary_push(array, ivar_keyword);
     rb_ary_push(array, ivar_parameters);
-    rb_yield(array);
+    line = rb_protect(rb_yield, array, &result);
+    if (result)
+    {
+      rb_ary_push(errors, rb_errinfo());
+      rb_set_errinfo(Qnil);
+    }
     ivar_line = rb_str_new2("");
     rb_ivar_set(self, id_ivar_line, ivar_line);
   }
 
+  rb_funcall(self, id_method_parse_errors, 1, errors);
+
   if (RTEST(progress_callback))
   {
     rb_funcall(progress_callback, id_method_call, 1, rb_float_new(1.0));
@@ -278,6 +292,7 @@ void Init_config_parser(void)
   id_method_strip = rb_intern("strip");
   id_method_to_s = rb_intern("to_s");
   id_method_upcase = rb_intern("upcase");
+  id_method_parse_errors = rb_intern("parse_errors");
 
   mOpenC3 = rb_define_module("OpenC3");
 

data/lib/openc3/api/api.rb

@@ -26,6 +26,7 @@ require 'openc3/api/cmd_api'
 require 'openc3/api/config_api'
 require 'openc3/api/interface_api'
 require 'openc3/api/limits_api'
+require 'openc3/api/metrics_api'
 require 'openc3/api/offline_access_api'
 require 'openc3/api/router_api'
 require 'openc3/api/settings_api'

data/lib/openc3/api/metrics_api.rb

@@ -0,0 +1,97 @@
+# encoding: ascii-8bit
+
+# Copyright 2023 OpenC3, Inc
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU Affero General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+
+# This file may also be used under the terms of a commercial license
+# if purchased from OpenC3, Inc.
+
+require 'openc3/models/metric_model'
+require 'openc3/utilities/authentication'
+require 'openc3/utilities/store'
+
+module OpenC3
+  module Api
+    WHITELIST ||= []
+    WHITELIST.concat([
+                       'get_metrics',
+                     ])
+
+    DELAY_METRICS = {}
+    DELAY_METRICS['decom_topic_delta_seconds'] = 0.0
+    DELAY_METRICS['interface_topic_delta_seconds'] = 0.0
+    DELAY_METRICS['log_topic_delta_seconds'] = 0.0
+    DELAY_METRICS['router_topic_delta_seconds'] = 0.0
+    DELAY_METRICS['text_log_topic_delta_seconds'] = 0.0
+
+    DURATION_METRICS = {}
+    DURATION_METRICS['decom_duration_seconds'] = 0.0
+    DURATION_METRICS['reducer_minute_processing_seconds'] = 0
+    DURATION_METRICS['reducer_hour_processing_seconds'] = 0
+    DURATION_METRICS['reducer_day_processing_seconds'] = 0
+
+    SUM_METRICS = {}
+    SUM_METRICS['cleanup_total'] = 0
+    SUM_METRICS['cleanup_delete_total'] = 0
+    SUM_METRICS['decom_total'] = 0
+    SUM_METRICS['decom_error_total'] = 0
+    SUM_METRICS['interface_cmd_total'] = 0
+    SUM_METRICS['interface_tlm_total'] = 0
+    SUM_METRICS['interface_directive_total'] = 0
+    SUM_METRICS['log_total'] = 0
+    SUM_METRICS['log_error_total'] = 0
+    SUM_METRICS['periodic_total'] = 0
+    SUM_METRICS['reducer_total'] = 0
+    SUM_METRICS['reducer_error_total'] = 0
+    SUM_METRICS['router_cmd_total'] = 0
+    SUM_METRICS['router_tlm_total'] = 0
+    SUM_METRICS['router_directive_total'] = 0
+    SUM_METRICS['text_log_total'] = 0
+    SUM_METRICS['text_log_error_total'] = 0
+
+    def get_metrics(scope: $openc3_scope, token: $openc3_token)
+      authorize(permission: 'system', scope: scope, token: token)
+
+      sum_metrics = SUM_METRICS.dup
+      duration_metrics = DURATION_METRICS.dup
+      delay_metrics = DELAY_METRICS.dup
+
+      metrics = MetricModel.all(scope: scope)
+      metrics.each do |microservice_name, metrics|
+        next unless metrics and metrics['values']
+        metrics['values'].each do |metric_name, data|
+          value = data['value']
+          if sum_metrics[metric_name]
+            sum_metrics[metric_name] += value
+          elsif duration_metrics[metric_name]
+            previous = duration_metrics[metric_name]
+            duration_metrics[metric_name] = value if value > previous
+          elsif delay_metrics.include?(metric_name)
+            previous = delay_metrics[metric_name]
+            delay_metrics[metric_name] = value if value > previous
+          else
+            # Ignore other metrics for now
+          end
+        end
+      end
+
+      result = delay_metrics
+      result.merge!(duration_metrics)
+      result.merge!(sum_metrics)
+
+      result.merge!(MetricModel.redis_metrics)
+
+      return result
+    end
+  end
+end

data/lib/openc3/api/tlm_api.rb

@@ -118,7 +118,8 @@ module OpenC3
     # @param type [Symbol] Telemetry type, :RAW, :CONVERTED (default), :FORMATTED, or :WITH_UNITS
     def inject_tlm(target_name, packet_name, item_hash = nil, type: :CONVERTED, scope: $openc3_scope, token: $openc3_token)
       authorize(permission: 'tlm_set', target_name: target_name, packet_name: packet_name, scope: scope, token: token)
-      unless CvtModel::VALUE_TYPES.include?(type.intern)
+      type = type.to_s.intern
+      unless CvtModel::VALUE_TYPES.include?(type)
         raise "Unknown type '#{type}' for #{target_name} #{packet_name}"
       end
 

data/lib/openc3/config/config_parser.rb

@@ -219,8 +219,6 @@ module OpenC3
                    size,
                    PARSING_REGEX,
                    &block)
-      rescue Exception => e # Catch EVERYTHING so we can re-raise with additional info
-        raise e, "#{e}\n\nParsed output in #{file.path}", e.backtrace
       ensure
         file.close unless file.closed?
       end
@@ -446,6 +444,22 @@ module OpenC3
       value
     end
 
+    def parse_errors(errors)
+      return if errors.empty?
+      message = ''
+      errors.each do |error|
+        if error.is_a? OpenC3::ConfigParser::Error
+          message += "\n#{File.basename(error.filename)}:#{error.line_number}: #{error.line}"
+          message += "\nError: #{error.message}"
+          message += "\nUsage: #{error.usage}" unless error.usage.empty?
+        else
+          message += "\n#{error.message}"
+        end
+        message += "\n"
+      end
+      raise message
+    end
+
     if RUBY_ENGINE != 'ruby' or ENV['OPENC3_NO_EXT']
       # Iterates over each line of the io object and yields the keyword and parameters
       def parse_loop(io, yield_non_keyword_lines, remove_quotes, size, rx)
@@ -454,6 +468,7 @@ module OpenC3
         @keyword = nil
         @parameters = []
         @line = ''
+        errors = []
 
         while true
           @line_number += 1
@@ -516,7 +531,11 @@ module OpenC3
           # Ignore lines without keywords: comments and blank lines
           if @keyword.nil?
             if yield_non_keyword_lines
-              yield(@keyword, @parameters)
+              begin
+                yield(@keyword, @parameters)
+              rescue => error
+                errors << error
+              end
             end
             @line = ''
             next
@@ -545,10 +564,16 @@ module OpenC3
             end
           end
 
-          yield(@keyword, @parameters)
+          begin
+            yield(@keyword, @parameters)
+          rescue => error
+            errors << error
+          end
           @line = ''
         end
 
+        parse_errors(errors)
+
         @@progress_callback.call(1.0) if @@progress_callback
 
         return nil

data/lib/openc3/core_ext/time.rb

@@ -17,7 +17,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
 require 'date'
@@ -58,6 +58,7 @@ class Time
   MINUTES_PER_HOUR = 60
   HOURS_PER_DAY = 24
   NSEC_PER_SECOND = 1_000_000_000
+  NSEC_PER_MSEC = 1_000_000
   USEC_PER_SECOND = USEC_PER_MSEC * MSEC_PER_SECOND
   MSEC_PER_MINUTE = 60 * MSEC_PER_SECOND
   MSEC_PER_HOUR = 60 * MSEC_PER_MINUTE
@@ -508,4 +509,8 @@ class Time
     nanoseconds = nsec_from_epoch % NSEC_PER_SECOND
     Time.at(seconds, nanoseconds, :nsec)
   end
+
+  def to_msec_from_epoch
+    (self.tv_sec * MSEC_PER_SECOND) + (self.tv_nsec / NSEC_PER_MSEC)
+  end
 end

data/lib/openc3/microservices/cleanup_microservice.rb

@@ -27,6 +27,14 @@ require 'openc3/utilities/bucket_utilities'
 
 module OpenC3
   class CleanupMicroservice < Microservice
+    def initialize(*args)
+      super(*args)
+      @metric.set(name: 'cleanup_total', value: @count, type: 'counter')
+      @delete_count = 0
+      @metric.set(name: 'cleanup_delete_total', value: @delete_count, type: 'counter')
+      @sleeper = Sleeper.new
+    end
+
     def run
       split_name = @name.split("__")
       target_name = split_name[-1]
@@ -55,15 +63,23 @@ module OpenC3
             oldest_list.each_slice(1000) do |slice|
               bucket.delete_objects(bucket: ENV['OPENC3_LOGS_BUCKET'], keys: slice)
               @logger.info("Deleted #{slice.length} #{target_name} log files")
+              @delete_count += slice.length
+              @metric.set(name: 'cleanup_delete_total', value: @delete_count, type: 'counter')
             end
           end
         end
 
         @count += 1
+        @metric.set(name: 'cleanup_total', value: @count, type: 'counter')
         @state = 'SLEEPING'
-        break if @microservice_sleeper.sleep(target.cleanup_poll_time)
+        break if @sleeper.sleep(target.cleanup_poll_time)
       end
     end
+
+    def shutdown
+      @sleeper.cancel
+      super()
+    end
   end
 end