logster 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 320e0b49302b25ebcaa67631295be41ddc7f0a14aa0dc7436ef1eefa5b662c77
-  data.tar.gz: 85c9ab97bebdbf09bbff49c4a93d8824ffe20968c1f3a4efe975f12072fdeb54
+  metadata.gz: 0fe7e01b692cb4454d249da6f9c9c1c03d5c765056e6ae6ee1a5571ddb38691c
+  data.tar.gz: 13ac426322e9993fb067144cf6a95fa3950602cd0d8e41c3521d8115751207e6
 SHA512:
-  metadata.gz: 0e99100761c77ee1191498ef11d2b8903b6ed23de85ba39bcd690e237ccb7b1e7e6c9fa5b27050bfe4870cb5caf0549c27cdc9903c2addb4afc75516384f46d2
-  data.tar.gz: 6b29eab99fc93e87a8a577fdb6eccff52308dcdf571a407ac42a6c458ae3b1175b48dbf94f7c48a93de8d614c584bfb1c5c3442675a7a66724aa3e913c404d8b
+  metadata.gz: c695dfd4d37c625fa8a51026f26cc5d1120aa370eba416828cac9bca3ea03e9412fbb8475af4b30684383ec7713f251a096e88ed9dbdfb830e80863dbef692cf
+  data.tar.gz: 3aa441c84018af760b9b2a7ca607a123cd27fd636cc6e29b4e8855518437f5c46417cc9513a51cd3d97dd213cfaf2c9ccbd7613931b5b80a03a60c3389b1e238

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+- 2019-12-13: 2.5.1
+
+  - DEV: Bump puma from 4.2.1 to 4.3.1 in /website (#100)
+  - FIX: Don't include messages that were removed from groups due to max size limit
+  - FIX: loadingEnv is an attribute of model
+  - FIX: Prevent crashing when reporting a non-string message to Logster
+  - UX: Group count attribute should be a long-running number of errors, not just the number of errors the group currently contains
+
 - 2019-12-12: 2.5.0
 
   - DEV: Update to latest version of gems

data/assets/javascript/client-app.js

@@ -57,7 +57,7 @@ this.model.selectRow(e,t)},tabChangedAction:function(e){this.model.tabChanged(e)
 confirm("Clear the logs?\n\nCancel = No, OK = Clear")&&(0,t.ajax)("/clear",{type:"POST"}).then(function(){e.model.reload()})},removeMessage:function(e){var t=this.model.currentRow.group?this.model.currentRow:null,n=this.model.rows,a=t?n.indexOf(t):n.indexOf(e)
 e.destroy(),e.set("selected",!1),this.model.set("total",this.model.total-1)
 var s=!1,i=0
-t?(i=t.messages.indexOf(e),t.messages.removeObject(e),i=Math.min(i,t.messages.length-1),t.decrementProperty("count"),0===t.messages.length&&(n.removeObject(t),s=!0)):(n.removeObject(e),s=!0),s?a>0?this.model.selectRow(n[a-1]):this.model.total>0?this.model.selectRow(n[0]):this.model.reload():t&&this.model.selectRow(n[a],{messageIndex:i})},solveMessage:function(e){this.model.solve(e)},groupedMessageChangedAction:function(e){this.model.groupedMessageChanged(e)},envChangedAction:function(e){this.model.envChanged(e)},updateFilter:function(e){var t=this
+t?(i=t.messages.indexOf(e),t.messages.removeObject(e),i=Math.min(i,t.messages.length-1),0===t.messages.length&&(n.removeObject(t),s=!0)):(n.removeObject(e),s=!0),s?a>0?this.model.selectRow(n[a-1]):this.model.total>0?this.model.selectRow(n[0]):this.model.reload():t&&this.model.selectRow(n[a],{messageIndex:i})},solveMessage:function(e){this.model.solve(e)},groupedMessageChangedAction:function(e){this.model.groupedMessageChanged(e)},envChangedAction:function(e){this.model.envChanged(e)},updateFilter:function(e){var t=this
 this.toggleProperty(e)
 var n=[];["Debug","Info","Warn","Err","Fatal"].forEach(function(e,a){t.get("show".concat(e))&&n.push(a)}),n.push(5),this.model.set("filter",n),this.model.reload().then(function(){return t.model.updateSelectedRow()})},updateSearch:function(e){e&&1===e.length||Ember.run.debounce(this,this.doSearch,e,250)}},doSearch:function(e){var t=this
 this.model.set("search",e),this.model.reload().then(function(){return t.model.updateSelectedRow()})}})
@@ -207,10 +207,10 @@ var t=Ember.HTMLBars.template({id:"zCP0V00P",block:'{"symbols":["tab","&default"
 e.default=t}),define("client-app/templates/components/time-formatter",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 var t=Ember.HTMLBars.template({id:"sp53cTcH",block:'{"symbols":[],"statements":[[1,[21,"time"],false],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/components/time-formatter.hbs"}})
 e.default=t}),define("client-app/templates/index",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-var t=Ember.HTMLBars.template({id:"ORfs9ULA",block:'{"symbols":["row"],"statements":[[7,"div"],[11,"id","top-panel"],[9],[0,"\\n  "],[7,"div"],[11,"id","log-table"],[9],[0,"\\n"],[4,"if",[[23,["model","moreBefore"]]],null,{"statements":[[0,"      "],[7,"div"],[11,"class","show-more"],[9],[0,"\\n"],[4,"if",[[23,["model","hideCountInLoadMore"]]],null,{"statements":[[0,"          Load more\\n"]],"parameters":[]},{"statements":[[0,"          Select to see "],[1,[23,["model","totalBefore"]],false],[0," more\\n"]],"parameters":[]}],[0,"      "],[3,"action",[[22,0,[]],"showMoreBefore"]],[10],[0,"\\n"]],"parameters":[]},null],[4,"each",[[23,["model","rows"]]],null,{"statements":[[0,"      "],[1,[27,"message-row",null,[["model","selectRow"],[[22,1,[]],[27,"action",[[22,0,[]],"selectRowAction",[22,1,[]]],null]]]],false],[0,"\\n"]],"parameters":[1]},null],[0,"  "],[10],[0,"\\n"],[10],[0,"\\n"],[7,"div"],[11,"id","bottom-panel"],[12,"class",[28,[[27,"if",[[23,["model","currentRow","group"]],"group-view"],null]]]],[9],[0,"\\n"],[4,"if",[[23,["model","currentRow","group"]]],null,{"statements":[[0,"    "],[1,[27,"page-nav",null,[["list","position","extraClasses","navigate"],[[23,["model","currentRow","messages"]],[23,["model","currentGroupedMessagesPosition"]],"group-nav",[27,"action",[[22,0,[]],"groupedMessageChangedAction"],null]]]],false],[0,"\\n"]],"parameters":[]},null],[0,"  "],[1,[27,"message-info",null,[["currentMessage","loadingEnv","removeMessage","solveMessage","onTabChange","envChangedAction","currentEnvPosition","actionsInMenu"],[[23,["model","currentMessage"]],[23,["loadingEnv"]],[27,"action",[[22,0,[]],"removeMessage"],null],[27,"action",[[22,0,[]],"solveMessage"],null],[27,"action",[[22,0,[]],"tabChangedAction"],null],[27,"action",[[22,0,[]],"envChangedAction"],null],[23,["model","currentEnvPosition"]],[23,["actionsInMenu"]]]]],false],[0,"\\n\\n  "],[7,"div"],[11,"class","action-panel"],[9],[0,"\\n    "],[7,"div"],[11,"class","severity-filters"],[9],[0,"\\n    "],[7,"div"],[11,"class","more-wrapping"],[9],[0,"\\n      "],[7,"label"],[11,"class","debug"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showDebug"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showDebug"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Debug"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","info"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showInfo"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showInfo"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Info"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","warn"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showWarn"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showWarn"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"i"],[11,"class","fa fa-exclamation-circle warning"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Warning"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","error"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showErr"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showErr"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"i"],[11,"class","fa fa-times-circle error"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Error"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","fatal"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showFatal"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showFatal"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"i"],[11,"class","fa fa-times-circle fatal"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Fatal"],[10],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n    "],[10],[0,"\\n    "],[7,"div"],[11,"class","search-clear-all"],[9],[0,"\\n      "],[7,"input"],[11,"class","search"],[11,"placeholder","Search"],[12,"onkeyup",[27,"action",[[22,0,[]],"updateSearch"],[["value"],["target.value"]]]],[11,"type","text"],[9],[10],[0,"\\n      "],[7,"div"],[11,"class","footer-btns"],[9],[0,"\\n"],[4,"if",[[23,["showSettings"]]],null,{"statements":[[4,"link-to",["settings"],[["class"],["settings btn no-text"]],{"statements":[[0,"            "],[7,"i"],[11,"class","fa fa-cog"],[9],[10],[0,"\\n"]],"parameters":[]},null]],"parameters":[]},null],[0,"        "],[7,"button"],[11,"class","clear btn danger"],[9],[7,"i"],[11,"class","fa fa-trash-o"],[9],[10],[7,"span"],[9],[0,"Clear logs"],[10],[3,"action",[[22,0,[]],"clear"]],[10],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n"],[10],[0,"\\n"],[1,[21,"panel-resizer"],false],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/index.hbs"}})
+var t=Ember.HTMLBars.template({id:"ZfZsvZU6",block:'{"symbols":["row"],"statements":[[7,"div"],[11,"id","top-panel"],[9],[0,"\\n  "],[7,"div"],[11,"id","log-table"],[9],[0,"\\n"],[4,"if",[[23,["model","moreBefore"]]],null,{"statements":[[0,"      "],[7,"div"],[11,"class","show-more"],[9],[0,"\\n"],[4,"if",[[23,["model","hideCountInLoadMore"]]],null,{"statements":[[0,"          Load more\\n"]],"parameters":[]},{"statements":[[0,"          Select to see "],[1,[23,["model","totalBefore"]],false],[0," more\\n"]],"parameters":[]}],[0,"      "],[3,"action",[[22,0,[]],"showMoreBefore"]],[10],[0,"\\n"]],"parameters":[]},null],[4,"each",[[23,["model","rows"]]],null,{"statements":[[0,"      "],[1,[27,"message-row",null,[["model","selectRow"],[[22,1,[]],[27,"action",[[22,0,[]],"selectRowAction",[22,1,[]]],null]]]],false],[0,"\\n"]],"parameters":[1]},null],[0,"  "],[10],[0,"\\n"],[10],[0,"\\n"],[7,"div"],[11,"id","bottom-panel"],[12,"class",[28,[[27,"if",[[23,["model","currentRow","group"]],"group-view"],null]]]],[9],[0,"\\n"],[4,"if",[[23,["model","currentRow","group"]]],null,{"statements":[[0,"    "],[1,[27,"page-nav",null,[["list","position","extraClasses","navigate"],[[23,["model","currentRow","messages"]],[23,["model","currentGroupedMessagesPosition"]],"group-nav",[27,"action",[[22,0,[]],"groupedMessageChangedAction"],null]]]],false],[0,"\\n"]],"parameters":[]},null],[0,"  "],[1,[27,"message-info",null,[["currentMessage","loadingEnv","removeMessage","solveMessage","onTabChange","envChangedAction","currentEnvPosition","actionsInMenu"],[[23,["model","currentMessage"]],[23,["model","loadingEnv"]],[27,"action",[[22,0,[]],"removeMessage"],null],[27,"action",[[22,0,[]],"solveMessage"],null],[27,"action",[[22,0,[]],"tabChangedAction"],null],[27,"action",[[22,0,[]],"envChangedAction"],null],[23,["model","currentEnvPosition"]],[23,["actionsInMenu"]]]]],false],[0,"\\n\\n  "],[7,"div"],[11,"class","action-panel"],[9],[0,"\\n    "],[7,"div"],[11,"class","severity-filters"],[9],[0,"\\n    "],[7,"div"],[11,"class","more-wrapping"],[9],[0,"\\n      "],[7,"label"],[11,"class","debug"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showDebug"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showDebug"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Debug"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","info"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showInfo"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showInfo"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Info"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","warn"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showWarn"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showWarn"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"i"],[11,"class","fa fa-exclamation-circle warning"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Warning"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","error"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showErr"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showErr"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"i"],[11,"class","fa fa-times-circle error"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Error"],[10],[0,"\\n      "],[10],[0,"\\n      "],[7,"label"],[11,"class","fatal"],[9],[0,"\\n        "],[7,"input"],[12,"checked",[21,"showFatal"]],[12,"onchange",[27,"action",[[22,0,[]],[27,"action",[[22,0,[]],"updateFilter","showFatal"],null]],null]],[11,"type","checkbox"],[9],[10],[0,"\\n        "],[7,"i"],[11,"class","fa fa-times-circle fatal"],[9],[10],[0,"\\n        "],[7,"span"],[9],[0,"Fatal"],[10],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n    "],[10],[0,"\\n    "],[7,"div"],[11,"class","search-clear-all"],[9],[0,"\\n      "],[7,"input"],[11,"class","search"],[11,"placeholder","Search"],[12,"onkeyup",[27,"action",[[22,0,[]],"updateSearch"],[["value"],["target.value"]]]],[11,"type","text"],[9],[10],[0,"\\n      "],[7,"div"],[11,"class","footer-btns"],[9],[0,"\\n"],[4,"if",[[23,["showSettings"]]],null,{"statements":[[4,"link-to",["settings"],[["class"],["settings btn no-text"]],{"statements":[[0,"            "],[7,"i"],[11,"class","fa fa-cog"],[9],[10],[0,"\\n"]],"parameters":[]},null]],"parameters":[]},null],[0,"        "],[7,"button"],[11,"class","clear btn danger"],[9],[7,"i"],[11,"class","fa fa-trash-o"],[9],[10],[7,"span"],[9],[0,"Clear logs"],[10],[3,"action",[[22,0,[]],"clear"]],[10],[0,"\\n      "],[10],[0,"\\n    "],[10],[0,"\\n  "],[10],[0,"\\n"],[10],[0,"\\n"],[1,[21,"panel-resizer"],false],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/index.hbs"}})
 e.default=t}),define("client-app/templates/settings",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 var t=Ember.HTMLBars.template({id:"VCEsnuWV",block:'{"symbols":[],"statements":[[7,"div"],[11,"class","settings-page"],[9],[0,"\\n  "],[4,"link-to",["index"],null,{"statements":[[0,"Home"]],"parameters":[]},null],[0,"\\n  "],[7,"div"],[11,"class","settings-header"],[9],[0,"\\n    "],[7,"h1"],[11,"class","header-title"],[9],[0,"Settings"],[10],[0,"\\n    "],[7,"img"],[11,"class","header-logo"],[12,"src",[27,"logster-url",["images/icon_144x144.png"],null]],[9],[10],[0,"\\n  "],[10],[0,"\\n\\n  "],[7,"div"],[11,"class","settings-section suppression-patterns"],[9],[0,"\\n    "],[7,"h2"],[11,"class","section-title"],[9],[0,"Suppression Patterns"],[10],[0,"\\n    "],[7,"div"],[9],[0,"New messages that match these Regular Expression patterns will be suppressed. Checking Apply retroactively will remove all existing messages that match the patterns."],[10],[0,"\\n\\n"],[4,"if",[[23,["showCodedSuppression"]]],null,{"statements":[[0,"      "],[7,"h3"],[11,"class","subsection-title"],[9],[0,"Hard-coded patterns:"],[10],[0,"\\n      "],[7,"div"],[11,"class","tip"],[9],[0,"These patterns can\'t be removed via the UI because they are commited to the source code of your app."],[10],[0,"\\n      "],[1,[27,"patterns-list",null,[["patterns","mutable"],[[23,["codedSuppression"]],false]]],false],[0,"\\n"]],"parameters":[]},null],[0,"\\n    "],[7,"h3"],[11,"class","subsection-title"],[9],[0,"Custom patterns:"],[10],[0,"\\n    "],[1,[27,"patterns-list",null,[["patterns","key","applyRetroactivelyCheckbox","mutable"],[[23,["customSuppression"]],"suppression",true,true]]],false],[0,"\\n  "],[10],[0,"\\n  "],[7,"div"],[11,"class","settings-section grouping-patterns"],[9],[0,"\\n    "],[7,"h2"],[11,"class","section-title"],[9],[0,"Grouping Patterns"],[10],[0,"\\n    "],[7,"div"],[9],[0,"Add a Regular Expression pattern to group all new and existing messages into a single row when viewing the logs."],[10],[0,"\\n\\n    "],[1,[27,"patterns-list",null,[["patterns","key","mutable"],[[23,["grouping"]],"grouping",true]]],false],[0,"\\n  "],[10],[0,"\\n"],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/settings.hbs"}})
 e.default=t}),define("client-app/templates/show",["exports"],function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 var t=Ember.HTMLBars.template({id:"Z9BtSx7U",block:'{"symbols":[],"statements":[[4,"link-to",["index"],null,{"statements":[[0,"Recent"]],"parameters":[]},null],[0,"\\n"],[7,"div"],[11,"id","bottom-panel"],[11,"class","full"],[9],[0,"\\n  "],[1,[27,"message-info",null,[["currentMessage","showTitle","envChangedAction","currentEnvPosition","actionsInMenu"],[[23,["model"]],"true",[27,"action",[[22,0,[]],"envChanged"],null],[23,["envPosition"]],false]]],false],[0,"\\n"],[10],[0,"\\n"]],"hasEval":false}',meta:{moduleName:"client-app/templates/show.hbs"}})
 e.default=t}),define("client-app/config/environment",[],function(){try{var e="client-app/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(decodeURIComponent(t))}
-return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(a){throw new Error('Could not read config from meta tag with name "'+e+'".')}}),runningTests||require("client-app/app").default.create({name:"client-app",version:"0.0.0+24d6cc97"})
+return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(a){throw new Error('Could not read config from meta tag with name "'+e+'".')}}),runningTests||require("client-app/app").default.create({name:"client-app",version:"0.0.0+43e54768"})

data/client-app/app/controllers/index.js

@@ -70,7 +70,6 @@ export default Controller.extend({
         messageIndex = group.messages.indexOf(msg);
         group.messages.removeObject(msg);
         messageIndex = Math.min(messageIndex, group.messages.length - 1);
-        group.decrementProperty("count");
         if (group.messages.length === 0) {
           rows.removeObject(group);
           removedRow = true;

data/client-app/app/templates/index.hbs

@@ -24,7 +24,7 @@
   {{/if}}
   {{message-info
     currentMessage=model.currentMessage
-    loadingEnv=loadingEnv
+    loadingEnv=model.loadingEnv
     removeMessage=(action "removeMessage")
     solveMessage=(action "solveMessage")
     onTabChange=(action "tabChangedAction")

data/lib/logster/group.rb

@@ -5,12 +5,13 @@ module Logster
     MAX_SIZE = 100
 
     attr_reader :key, :messages_keys, :timestamp, :messages
-    attr_accessor :changed
+    attr_accessor :changed, :pattern, :count
 
-    def initialize(key, messages_keys = [], timestamp: 0)
+    def initialize(key, messages_keys = [], timestamp: 0, count: 0)
       @key = key
       @messages_keys = messages_keys || []
       @timestamp = timestamp
+      @count = count
       @changed = true
     end
 
@@ -19,7 +20,8 @@ module Logster
       group = new(
         hash["key"],
         hash["messages_keys"],
-        timestamp: hash["timestamp"] || 0
+        timestamp: hash["timestamp"] || 0,
+        count: hash["count"] || 0
       )
       group.changed = false
       group
@@ -33,14 +35,15 @@ module Logster
       {
         key: @key,
         messages_keys: @messages_keys,
-        timestamp: @timestamp
+        timestamp: @timestamp,
+        count: @count
       }
     end
 
     def to_h_web
       {
         regex: @key,
-        count: self.count,
+        count: @count,
         timestamp: @timestamp,
         messages: @messages,
         severity: -1,
@@ -55,6 +58,7 @@ module Logster
     def add_message(message)
       if !@messages_keys.include?(message.key)
         @messages_keys.unshift(message.key)
+        @count += 1
         @changed = true
       end
       if @timestamp < message.timestamp
@@ -101,10 +105,6 @@ module Logster
       @changed
     end
 
-    def count
-      @messages_keys.size
-    end
-
     private
 
     def max_size

data/lib/logster/grouping_pattern.rb

@@ -16,6 +16,7 @@ module Logster
         m.message =~ self.pattern && existing_groups.none? { |g| g.messages_keys.include?(m.key) }
       end
       group.messages = messages
+      group.count = messages.size
       @store.save_pattern_group(group) if group.changed?
       @store.clear_patterns_cache(CACHE_KEY)
     end

data/lib/logster/message.rb

@@ -254,6 +254,7 @@ module Logster
 
     def truncate_message(msg)
       return msg unless msg
+      msg = msg.inspect unless String === msg
       msg.size <= MAX_MESSAGE_LENGTH ? msg : msg[0...MAX_MESSAGE_LENGTH] + "..."
     end
 

data/lib/logster/redis_store.rb

@@ -134,11 +134,12 @@ module Logster
 
           row = filter_search(row, search)
           if row
+            matches_pattern = pattern_groups.any? { |g| row.message =~ g.pattern }
             group = pattern_groups.find { |g| g.messages_keys.include?(row.key) }
             if group && !known_groups.include?(group.key)
               known_groups << group.key
               temp << serialize_group(group, row.key)
-            elsif !group
+            elsif !matches_pattern
               temp << row
             end
           end
@@ -350,6 +351,7 @@ module Logster
       jsons.map! do |json|
         if json && json.size > 0
           group = Logster::Group.from_json(json)
+          group.pattern = patterns[mapped.index(group.key)]
           if load_messages
             group.messages = bulk_get(group.messages_keys, with_env: false)
           end
@@ -361,7 +363,7 @@ module Logster
     end
 
     def save_pattern_group(group)
-      if group.count == 0
+      if group.messages_keys.size == 0
         @redis.hdel(pattern_groups_key, group.key)
       else
         @redis.hset(pattern_groups_key, group.key, group.to_json)

data/lib/logster/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logster
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end

data/test/logster/test_group.rb

@@ -14,7 +14,8 @@ class TestGroup < MiniTest::Test
     json = JSON.generate(
       key: '/somekey/',
       messages_keys: [111, 222, 333].map(&:to_s),
-      timestamp: time
+      timestamp: time,
+      count: 3
     )
     group = Logster::Group.from_json(json)
     refute group.changed?
@@ -49,6 +50,7 @@ class TestGroup < MiniTest::Test
     ]
     messages << messages[0]
     group.messages = messages
+    group.count = 4
     assert_equal 4, group.count
     assert_equal 74, group.timestamp
     expected = messages.uniq(&:key).sort_by(&:timestamp).map(&:key).reverse
@@ -67,13 +69,15 @@ class TestGroup < MiniTest::Test
       get_message(390)
     ]
     messages.each { |m| group.add_message(m) }
-    assert_equal 5, group.count
+    # the count attr keeps track of the number of messages
+    # that has ever been added to the group.
+    # It should never decrease
+    assert_equal 6, group.count
     assert_equal 390, group.timestamp
     refute_includes group.messages_keys, messages.find { |m| m.timestamp == 10 }.key
 
     group = get_group
     group.messages = messages
-    assert_equal 5, group.count
     assert_equal 390, group.timestamp
     refute_includes group.messages.map(&:timestamp), 5
   ensure

data/test/logster/test_redis_store.rb

@@ -938,7 +938,8 @@ class TestRedisStore < Minitest::Test
     end
     groups = @store.find_pattern_groups
     assert_equal 1, groups.size
-    assert_equal 4, groups[0].count
+    assert_equal 4, groups[0].messages_keys.size
+    assert_equal 5, groups[0].count
     assert_equal keys[1..-1].reverse, groups[0].messages_keys
   ensure
     @store.max_backlog = prev_max_backlog
@@ -965,12 +966,35 @@ class TestRedisStore < Minitest::Test
   def test_adding_grouping_pattern_doesnt_add_a_message_to_more_than_one_group
     Logster.config.enable_custom_patterns_via_ui = true
     @store.report(Logger::WARN, '', 'trim this plz')
+    @store.report(Logger::WARN, '', 'trim this plz 2')
     Logster::GroupingPattern.new(/trim/, store: @store).save
     Logster::GroupingPattern.new(/this/, store: @store).save
     groups = @store.find_pattern_groups
     assert_equal 1, groups.size
+    assert_equal 2, groups[0].count
+  ensure
+    Logster.config.enable_custom_patterns_via_ui = false
+  end
+
+  def test_latest_doesnt_include_rows_that_are_removed_from_grouping_patterns_due_to_max_size
+    Logster.config.enable_custom_patterns_via_ui = true
+    Logster::Group.instance_variable_set(:@max_size, 5)
+    msg1 = @store.report(Logger::WARN, '', 'first message')
+    msg2 = @store.report(Logger::WARN, '', 'second message')
+    Logster::GroupingPattern.new(/noisy/, store: @store).save
+
+    grouped = []
+    7.times do |n|
+      grouped << @store.report(Logger::WARN, '', "noisy message #{n}", timestamp: n).key
+    end
+    msg3 = @store.report(Logger::WARN, '', 'third message')
+    results = @store.latest
+
+    assert_equal [msg1.key, msg2.key, '/noisy/', msg3.key], results.map(&:key)
+    assert_equal grouped.reverse.first(5), results[2].messages.map(&:key)
   ensure
     Logster.config.enable_custom_patterns_via_ui = false
+    Logster::Group.remove_instance_variable(:@max_size)
   end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logster
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - UI for viewing logs in Rack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler