File 0261-Remove-get_default_config-0.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0261-Remove-get_default_config-0.patch of Package erlang (Revision 3a70bf3d6fd4a5cb52eaedadd0de8996)

Currently displaying revision 3a70bf3d6fd4a5cb52eaedadd0de8996 , Show latest

From 5b9497fcdba188bc9f030ca785b0341e30f9daa8 Mon Sep 17 00:00:00 2001
From: vkatsuba <v.katsuba.dev@gmail.com>
Date: Wed, 9 Jun 2021 18:25:53 +0300
Subject: [PATCH 1/3] Remove get_default_config/0

Deleted merging with empty maps
---
 lib/kernel/src/logger_disk_log_h.erl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/kernel/src/logger_disk_log_h.erl b/lib/kernel/src/logger_disk_log_h.erl
index 8be6b5e69c..bba7d5b0d6 100644
--- a/lib/kernel/src/logger_disk_log_h.erl
+++ b/lib/kernel/src/logger_disk_log_h.erl
@@ -98,7 +98,7 @@ init(Name, #{file:=File,type:=Type,max_no_bytes:=MNB,max_no_files:=MNF}) ->
     end.
 
 check_config(Name,set,undefined,HConfig0) ->
-    HConfig=merge_default_logopts(Name,maps:merge(get_default_config(),HConfig0)),
+    HConfig=merge_default_logopts(Name,HConfig0),
     check_config(HConfig);
 check_config(_Name,SetOrUpdate,OldHConfig,NewHConfig0) ->
     WriteOnce = maps:with([type,file,max_no_files,max_no_bytes],OldHConfig),
@@ -106,7 +106,7 @@ check_config(_Name,SetOrUpdate,OldHConfig,NewHConfig0) ->
         case SetOrUpdate of
             set ->
                 %% Do not reset write-once fields to defaults
-                maps:merge(get_default_config(),WriteOnce);
+                WriteOnce;
             update ->
                 OldHConfig
         end,
@@ -147,9 +147,6 @@ check_h_config([Other | _]) ->
 check_h_config([]) ->
     ok.
 
-get_default_config() ->
-     #{}.
-
 merge_default_logopts(Name, HConfig) ->
     Type = maps:get(type, HConfig, wrap),
     {DefaultNoFiles,DefaultNoBytes} =
-- 
2.31.1

Places

File 0261-Remove-get_default_config-0.patch of Package erlang (Revision 3a70bf3d6fd4a5cb52eaedadd0de8996)

Places