Skip to content

Commit 791222b

Browse files
committed
Feedback
1 parent 485ad99 commit 791222b

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/ra_log_wal.erl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,9 @@ init(#{dir := Dir, system := System} = Conf0) ->
279279
process_flag(message_queue_data, off_heap),
280280
process_flag(min_bin_vheap_size, MinBinVheapSize),
281281
process_flag(min_heap_size, MinHeapSize),
282-
CRef = ra_counters:new(WalName, ?COUNTER_FIELDS, #{ra_system => System, module => ?MODULE}),
282+
CRef = ra_counters:new(WalName,
283+
?COUNTER_FIELDS,
284+
#{ra_system => System, module => ?MODULE}),
283285
Conf = #conf{dir = Dir,
284286
segment_writer = SegWriter,
285287
compute_checksums = ComputeChecksums,

src/ra_server.hrl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
uid :: ra_uid(),
1717
log_id :: unicode:chardata(),
1818
metrics_key :: term(),
19-
metrics_labels :: map(),
19+
metrics_labels :: seshat:labels_map(),
2020
machine :: ra_machine:machine(),
2121
machine_version :: ra_machine:version(),
2222
machine_versions :: [{ra_index(), ra_machine:version()}, ...],

src/ra_server_proc.erl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,9 @@ do_init(#{id := Id,
317317
true = ets:insert(ra_state, {Key, init, unknown}),
318318
process_flag(trap_exit, true),
319319
MetricLabels = maps:get(metrics_labels, Config0, #{}),
320-
Config = #{counter := Counter,
321-
system_config := #{names := Names} = SysConf} = maps:merge(config_defaults(Id, MetricLabels),
322-
Config0),
320+
Config = maps:merge(config_defaults(Id, MetricLabels), Config0),
321+
#{counter := Counter,
322+
system_config := #{names := Names} = SysConf} = Config,
323323
MsgQData = maps:get(message_queue_data, SysConf, off_heap),
324324
MinBinVheapSize = maps:get(server_min_bin_vheap_size, SysConf,
325325
?MIN_BIN_VHEAP_SIZE),
@@ -1807,7 +1807,8 @@ config_defaults(ServerId, MetricLabels) ->
18071807
Counter = case ra_counters:fetch(ServerId) of
18081808
undefined ->
18091809
ra_counters:new(ServerId,
1810-
{persistent_term, ?FIELDSPEC_KEY}, MetricLabels);
1810+
{persistent_term, ?FIELDSPEC_KEY},
1811+
MetricLabels);
18111812
C ->
18121813
C
18131814
end,

0 commit comments

Comments
 (0)