log_sense 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b24aa444f64beeb8b13bda22aae730130cff025b4d122557499d3afd2ec2e73
-  data.tar.gz: 809c695be701f9a6f17a4b31d4c9c61827a97a9088cb180b6f7f60a794e498f3
+  metadata.gz: c2acfa576d18214e05df5520518000955d12957756674c26a5fd63ac6efc9969
+  data.tar.gz: 781b38f2a7118efe8f0c1ca0cba6d21bdf0a77bd3fe27a8c1dc27ca5cdc2b3e7
 SHA512:
-  metadata.gz: afff457f8f952f7f6b806baaf56ac34010027498be04fdbfaa91653ab70699f3d3d85222b47437c2df151f00fb953e23d21a5ac537562cf14a157459762e4855
-  data.tar.gz: 911594383266801861454d6facb9ee4c2db852979d2349250d988934721925ed6592b9fdbb2c63d43814305ca062478d8984bd07166ff90c3928120dc17c3129
+  metadata.gz: bc877d0198d6f170addfd9a0972ed7df57df2d5c00fdac850808ab1f8f86c3ed3d2aa37cc1058f1c6ca1da86bbdc6e6e09a44778edca3a48aaf825f4d5aefa26
+  data.tar.gz: ed99ed592a9a689fac9d319b1f346e705fcbbde021f45332d219097ed0df351d6b1d8a7bf2e0a72307b9932e2ab63ece7d0d8c2f2ef4fb9be45d14e2a5c6c863

data/CHANGELOG.org

@@ -2,10 +2,14 @@
 #+AUTHOR: Adolfo Villafiorita
 #+STARTUP: showall
 
+* 2.2.1
+
+- [Bug] Small fixes  
+
 * 2.2.0
 
 - [User] Better management of Delayed Job (show also completed)
-- [Refactoring] Regexps are now pre-compiled with /o
+- [Refactoring] Rails rxegexps are now pre-compiled with /o
   
 * 2.1.0
 

data/lib/log_sense/rails/log_parser.rb

@@ -369,6 +369,8 @@ module LogSense
             #
             data = match_and_process_job_error line
             if data
+              id = data[:object_id]
+              # TODO: no need for if (here and everywhere else)
               # it has to be there!
               if pending_jobs[id]
                 data = (pending_jobs[id] || {}).merge(data)
@@ -377,7 +379,7 @@ module LogSense
               ins_job.execute(
                 data[:started_at],
                 data[:ended_at],
-                0,
+                nil,
                 data[:worker],
                 data[:host],
                 data[:pid],
@@ -460,7 +462,7 @@ module LogSense
         # exit_status = matchdata[:status].to_i == 500 ? "E" : "I"
         if matchdata
           {
-            exit_status: "I",
+            exit_status: "S:COMPLETED",
             ended_at: matchdata[:timestamp],
             log_id: matchdata[:log_id],
             status: matchdata[:status],
@@ -497,7 +499,7 @@ module LogSense
         matchdata = FATAL_REGEXP.match line
         if matchdata
           {
-            exit_status: "F",
+            exit_status: "S:FAILED",
             log_id: matchdata[:log_id],
           }
         end
@@ -639,7 +641,7 @@ module LogSense
             log_id: matchdata.named_captures["log_id"],
             object_id: matchdata[:id],
             method: matchdata[:method],
-            exit_status: 'C',
+            exit_status: 'S:COMPLETED',
             arguments: matchdata[:arguments]
           }
         end
@@ -656,7 +658,11 @@ module LogSense
         [ERROR_MESSAGE_PERMANENT, ERROR_MESSAGE, ERROR_MESSAGE_SHORT].map do |regexp|
           matchdata = regexp.match line
           if matchdata
-            exit_status = matchdata[:error_msg].include? "permanently" ? "F" : "E"
+            exit_status = if matchdata[:error_msg].include?("permanently")
+                            "S:FAILED"
+                          else
+                            "S:ERROR"
+                          end
 
             return {
               ended_at: matchdata[:timestamp],
@@ -668,7 +674,7 @@ module LogSense
               object_id: matchdata[:id],
               method: matchdata[:method],
               arguments: matchdata.named_captures["arguments"],
-              exit_status: 'E',
+              exit_status:,
               attempt: matchdata[:attempt],
               error_msg: matchdata[:error_msg],
             }

data/lib/log_sense/rails_aggregator.rb

@@ -108,7 +108,7 @@ module LogSense
                  sum(iif(context NOT LIKE '%ActionController::RoutingError%', 1, 0)) as OtherErrors
                  FROM Event JOIN Error
                  ON event.log_id == error.log_id
-                 WHERE #{filter} and exit_status == 'F'
+                 WHERE #{filter} and exit_status == 'S:FAILED'
                  GROUP BY strftime("%Y-%m-%d", started_at)
       ).gsub("\n", "") || [[]]
 
@@ -121,7 +121,7 @@ module LogSense
                  event.log_id
                  FROM Event JOIN Error
                  ON event.log_id == error.log_id
-                 WHERE #{filter} and exit_status == 'F'
+                 WHERE #{filter} and exit_status == 'S:FAILED'
       ).gsub("\n", "") || [[]]
 
       @fatal_grouped = @db.execute %(
@@ -136,8 +136,8 @@ module LogSense
       
       @job_plot = @db.execute %(
           SELECT strftime("%Y-%m-%d", ended_at) as Day,
-                 sum(iif(exit_status == 'C', 1, 0)) as Completed,
-                 sum(iif(exit_status == 'E', 1, 0)) as Errors
+                 sum(iif(exit_status == 'S:COMPLETED', 1, 0)) as Completed,
+                 sum(iif(exit_status == 'S:ERROR' or exit_status == 'S:FAILED', 1, 0)) as Errors
                  FROM Job
                  WHERE #{filter}
                  GROUP BY strftime("%Y-%m-%d", ended_at)
@@ -164,14 +164,14 @@ module LogSense
          SELECT worker,
                 host,
                 pid,
-                exit_status,
                 object_id,
+                exit_status,
                 GROUP_CONCAT(DISTINCT(error_msg)),
                 method,
                 arguments,
                 max(attempt)
                 FROM Job
-                WHERE #{filter} and exit_status == 'E'
+                WHERE #{filter} and (exit_status == 'S:ERROR' or exit_status == 'S:FAILED')
                 GROUP BY object_id
       ).gsub("\n", "") || [[]]
 

data/lib/log_sense/rails_report_shaper.rb

@@ -225,7 +225,7 @@ module LogSense
             completed with "performed".
           ),
           header: %w[Date Duration PID ID Exit_Status Method Arguments Error_Msg Attempts],
-          column_alignment: %i[left left right left left left left left right],
+          column_alignment: %i[left right left left left left left left right],
           column_width: ["10%", "5%", "5%", "5%", "5%", "15%", "25%", "25%", "5%"],
           rows: data[:jobs],
           col: "small-12 cell",
@@ -278,9 +278,9 @@ module LogSense
         },
         {
           title: "Job Errors (grouped)",
-          header: %w[Worker Host PID ID Error Method Arguments Attempts],
-          column_alignment: %i[left left left left left left left right],
-          column_width: ["5%", "5%", "5%", "5%", "20%", "30%", "20%", "10%"],
+          header: %w[Worker Host PID ID Exit_Status Error Method Arguments Attempts],
+          column_alignment: %i[left left left left left left left left right],
+          column_width: ["5%", "5%", "5%", "5%", "5%", "20%", "25%", "20%", "10%"],
           rows: data[:job_error_grouped],
           col: "small-12 cell"
         }

data/lib/log_sense/version.rb

@@ -1,3 +1,3 @@
 module LogSense
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log_sense
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Adolfo Villafiorita