Pull request #84: Write log messages to file

Merge in COSMOSEE/base from log-messages-file to master

* commit '997ad7a48b2f9b64f3d7402c95bc06283ec8cbc5':
  Write log messages to file
  Fix text log filenames

Author: ryan-pratt

cosmos/lib/cosmos/logs/log_writer.rb

@@ -60,7 +60,6 @@ def initialize(
       cycle_minute = nil,
       redis_topic: nil
     )
-
       @remote_log_directory = remote_log_directory
       @logging_enabled = ConfigParser.handle_true_false(logging_enabled)
       @cycle_time = ConfigParser.handle_nil(cycle_time)

cosmos/lib/cosmos/logs/packet_log_writer.rb

@@ -52,15 +52,15 @@ def initialize(
       cycle_minute = nil,
       redis_topic: nil
     )
-    super(
-      remote_log_directory,
-      logging_enabled,
-      cycle_time,
-      cycle_size,
-      cycle_hour,
-      cycle_minute,
-      redis_topic: redis_topic
-    )
+      super(
+        remote_log_directory,
+        logging_enabled,
+        cycle_time,
+        cycle_size,
+        cycle_hour,
+        cycle_minute,
+        redis_topic: redis_topic
+      )
       @label = label
       @index_file = nil
       @index_filename = nil

cosmos/lib/cosmos/logs/text_log_writer.rb

@@ -54,7 +54,11 @@ def write_entry(time_nsec_since_epoch, data)
     end
 
     def s3_filename
-      "#{first_timestamp}__#{last_timestamp}__notifications" + extension
+      # Put the name of the redis topic in the filename, but remove the scope
+      # because we're already in a directory with the scope name
+      split_index = @redis_topic.index("__") + 2
+      topic_name = @redis_topic[split_index, @redis_topic.length - split_index]
+      "#{first_timestamp}__#{last_timestamp}__#{topic_name}" + extension
     end
 
     def extension

cosmos/lib/cosmos/models/scope_model.rb

@@ -66,6 +66,23 @@ def deploy(gem_path, variables)
       microservice.deploy(gem_path, variables)
       Logger.info "Configured microservice #{microservice_name}"
 
+      # COSMOS Log Microservice
+      microservice_name = "#{@scope}__COSMOS__LOG"
+      microservice = MicroserviceModel.new(
+        name: microservice_name,
+        cmd: ["ruby", "text_log_microservice.rb", microservice_name],
+        work_dir: '/cosmos/lib/cosmos/microservices',
+        options: [
+          # The following options are optional (600 and 50_000_000 are the defaults)
+          # ["CYCLE_TIME", "600"], # Keep at most 10 minutes per log
+          # ["CYCLE_SIZE", "50_000_000"] # Keep at most ~50MB per log
+        ],
+        topics: ["#{@scope}__cosmos_log_messages"],
+        scope: @scope)
+      microservice.create
+      microservice.deploy(gem_path, variables)
+      Logger.info "Configured microservice #{microservice_name}"
+
       # Notification Log Microservice
       microservice_name = "#{@scope}__NOTIFICATION__LOG"
       microservice = MicroserviceModel.new(

cosmos/lib/cosmos/utilities/logger.rb

@@ -184,6 +184,7 @@ def self.instance
     protected
     def log_metric(data, scope:, &block)
       @mutex.synchronize do
+        data[:time] = Time.now.to_nsec_from_epoch
         data[:@timestamp] = Time.now.xmlschema(3)
         data[:microservice_name] = @microservice_name if @microservice_name
         data[:detail] = @detail_string if @detail_string
@@ -204,7 +205,7 @@ def log_metric(data, scope:, &block)
 
     def log_message(severity_string, message, scope:, &block)
       @mutex.synchronize do
-        data = { '@timestamp' => Time.now.xmlschema(3), severity: severity_string }
+        data = { time: Time.now.to_nsec_from_epoch, '@timestamp' => Time.now.xmlschema(3), severity: severity_string }
         data[:microservice_name] = @microservice_name if @microservice_name
         data[:detail] = @detail_string if @detail_string
         if block_given?