lib/logster/base_store.rb in logster-2.5.1 vs lib/logster/base_store.rb in logster-2.6.0

@@ -16,11 +16,11 @@
     def save(message)
       not_implemented
     end
 
     # Modify the saved message to the given one (identified by message.key) and bump it to the top of the latest list
-    def replace_and_bump(message, save_env: true)
+    def replace_and_bump(message)
       not_implemented
     end
 
     # Check if another message with the same grouping_key is already stored.
     # Returns the similar message's message.key
@@ -193,29 +193,36 @@
       end
 
       similar = nil
 
       if Logster.config.allow_grouping
+        message.apply_message_size_limit(
+          Logster.config.maximum_message_size_bytes,
+          gems_dir: Logster.config.gems_dir
+        )
         key = self.similar_key(message)
         similar = get(key, load_env: false) if key
       end
 
+      message.drop_redundant_envs(Logster.config.max_env_count_per_message)
+      message.apply_env_size_limit(Logster.config.max_env_bytes)
+      saved = true
       if similar
-        if similar.count < Logster::MAX_GROUPING_LENGTH
-          similar.env = get_env(similar.key) || {}
-        end
-        save_env = similar.merge_similar_message(message)
-
-        replace_and_bump(similar, save_env: save_env)
+        similar.merge_similar_message(message)
+        replace_and_bump(similar)
         similar
       else
-        save message
+        message.apply_message_size_limit(
+          Logster.config.maximum_message_size_bytes,
+          gems_dir: Logster.config.gems_dir
+        )
+        saved = save(message)
         message
       end
 
       message = similar || message
 
-      if Logster.config.enable_custom_patterns_via_ui || allow_custom_patterns
+      if (Logster.config.enable_custom_patterns_via_ui || allow_custom_patterns) && saved
         grouping_patterns = @patterns_cache.fetch(Logster::GroupingPattern::CACHE_KEY) do
           Logster::GroupingPattern.find_all(store: self)
         end
 
         grouping_patterns.each do |pattern|