Skip to content

Commit 47010ab

Browse files
committed
Convert Logger to inline style
1 parent dcc7ad0 commit 47010ab

File tree

3 files changed

+29
-38
lines changed

3 files changed

+29
-38
lines changed

lib/modules/mnesia_assistant/error.ex

+14-22
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ defmodule MnesiaAssistant.Error do
7272

7373
def error_description(error, identifier) when error in [{:atomic, :ok}, :ok] do
7474
Logger.info(
75-
"Identifier: #{inspect(identifier)}; The action concerned was completed successfully."
75+
"Identifier: #{inspect(identifier)} ::: MnesiaMessage: The action concerned was completed successfully."
7676
)
7777

7878
{:ok, :atomic}
7979
end
8080

8181
def error_description(:starting, identifier) do
8282
Logger.info(
83-
"Identifier: #{inspect(identifier)}; The action concerned is being started successfully."
83+
"Identifier: #{inspect(identifier)} ::: MnesiaMessage: The action concerned is being started successfully."
8484
)
8585

8686
{:ok, :atomic}
@@ -89,11 +89,9 @@ defmodule MnesiaAssistant.Error do
8989
def error_description({:aborted, {:already_exists, _module}} = error, identifier) do
9090
converted = error_description(error)
9191

92-
Logger.warning("""
93-
Identifier: #{inspect(identifier)}
94-
MnesiaError: #{inspect(error)}
95-
ConvertedError: #{inspect(converted)}
96-
""")
92+
Logger.warning(
93+
"Identifier: #{inspect(identifier)} ::: MnesiaError: #{inspect(error)} ::: ConvertedError: #{inspect(converted)}"
94+
)
9795

9896
err = if is_tuple(converted), do: to_string(elem(converted, 0)), else: converted
9997
{:error, error, err}
@@ -102,11 +100,9 @@ defmodule MnesiaAssistant.Error do
102100
def error_description({:error, {_, {:already_exists, _}}} = error, identifier) do
103101
converted = error_description(error)
104102

105-
Logger.warning("""
106-
Identifier: #{inspect(identifier)}
107-
MnesiaError: #{inspect(error)}
108-
ConvertedError: #{inspect(converted)}
109-
""")
103+
Logger.warning(
104+
"Identifier: #{inspect(identifier)} ::: MnesiaError: #{inspect(error)} ::: ConvertedError: #{inspect(converted)}"
105+
)
110106

111107
err = if is_tuple(converted), do: to_string(elem(converted, 0)), else: converted
112108
{:error, error, err}
@@ -116,11 +112,9 @@ defmodule MnesiaAssistant.Error do
116112
if elem(error_type, 0) in @error_types do
117113
converted = error_description(error)
118114

119-
Logger.error("""
120-
Identifier: #{inspect(identifier)}
121-
MnesiaError: #{inspect(error)}
122-
ConvertedError: #{inspect(converted)}
123-
""")
115+
Logger.error(
116+
"Identifier: #{inspect(identifier)} ::: MnesiaError: #{inspect(error)} ::: ConvertedError: #{inspect(converted)}"
117+
)
124118

125119
err = if is_tuple(converted), do: to_string(elem(converted, 0)), else: converted
126120
{:error, error, err}
@@ -132,11 +126,9 @@ defmodule MnesiaAssistant.Error do
132126
def error_description(error, identifier) do
133127
converted = error_description(error)
134128

135-
Logger.error("""
136-
Identifier: #{inspect(identifier)}
137-
MnesiaError: #{inspect(error)}
138-
ConvertedError: #{inspect(converted)}
139-
""")
129+
Logger.error(
130+
"Identifier: #{inspect(identifier)} ::: MnesiaError: #{inspect(error)} ::: ConvertedError: #{inspect(converted)}"
131+
)
140132

141133
{:error, error, converted}
142134
end

lib/modules/mnesia_assistant/mnesia_assistant.ex

+4-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ defmodule MnesiaAssistant do
5858

5959
@doc false
6060
def start(mode, dir, identifier) do
61-
Logger.warning("Mnesia's initial valuation process has begun.")
61+
Logger.warning(
62+
"Identifier: #{inspect(identifier)} ::: MnesiaMessage: Mnesia's initial valuation process has begun."
63+
)
64+
6265
stop() |> MError.error_description()
6366
mnesia_dir = dir <> "/#{mode}"
6467
File.mkdir_p(mnesia_dir) |> MError.error_description(identifier)

lib/modules/mnesia_assistant/operation/table.ex

+11-15
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ defmodule MnesiaAssistant.Table do
276276
case wait_for_tables(tables, timeout) do
277277
:ok ->
278278
Logger.info(
279-
"Identifier: #{inspect(identifier)}; The action concerned was completed successfully."
279+
"Identifier: #{inspect(identifier)} ::: MnesiaMessage: The action concerned was completed successfully."
280280
)
281281

282282
{:ok, :atomic}
@@ -286,22 +286,18 @@ defmodule MnesiaAssistant.Table do
286286
{"The requested tables could not be loaded in the specified time #{timeout}.",
287287
missing_tables}
288288

289-
Logger.error("""
290-
Identifier: #{inspect(identifier)}
291-
MnesiaError: #{inspect(error)}
292-
ConvertedError: #{inspect(converted)}
293-
""")
289+
Logger.error(
290+
"Identifier: #{inspect(identifier)} ::: MnesiaError: #{inspect(error)} ::: ConvertedError: #{inspect(converted)}"
291+
)
294292

295293
{:error, error, elem(converted, 0)}
296294

297295
error ->
298296
converted = MnesiaAssistant.Error.error_description(error)
299297

300-
Logger.error("""
301-
Identifier: #{inspect(identifier)}
302-
MnesiaError: #{inspect(error)}
303-
ConvertedError: #{inspect(converted)}
304-
""")
298+
Logger.error(
299+
"Identifier: #{inspect(identifier)} ::: MnesiaError: #{inspect(error)} ::: ConvertedError: #{inspect(converted)}"
300+
)
305301

306302
err = if is_tuple(converted), do: to_string(elem(converted, 0)), else: converted
307303
{:error, error, err}
@@ -858,7 +854,7 @@ defmodule MnesiaAssistant.Table do
858854
re_wait_for_tables(true, [], number + 1, max_try, module, identifier, waiting_time)
859855

860856
error ->
861-
Logger.error("Identifier: #{inspect(module)}; Source: #{inspect(error)}")
857+
Logger.error("Identifier: #{inspect(module)} ::: Source: #{inspect(error)}")
862858
{:error, :create_table, error, identifier}
863859
end
864860

@@ -868,7 +864,7 @@ defmodule MnesiaAssistant.Table do
868864

869865
error ->
870866
Logger.error(
871-
"Identifier: #{inspect(module)}; Tries to get the table again(count: #{number + 1}). Source: #{inspect(error)}"
867+
"Identifier: #{inspect(module)} ::: MnesiaError: Tries to get the table again(count: #{number + 1}). ::: Source: #{inspect(error)}"
872868
)
873869

874870
new_output =
@@ -886,15 +882,15 @@ defmodule MnesiaAssistant.Table do
886882

887883
defp re_wait_for_tables(false, output, number, _, module, identifier, _) do
888884
Logger.error(
889-
"Identifier: #{inspect(module)}; Tries to get the table again(count: #{number + 1}). Source: #{inspect(output)}"
885+
"Identifier: #{inspect(module)} ::: MnesiaError: Tries to get the table again(count: #{number + 1}). ::: Source: #{inspect(output)}"
890886
)
891887

892888
{:error, :create_table, output, identifier}
893889
end
894890

895891
defp re_wait_for_tables(true, _output, number, max_try, module, identifier, waiting_time) do
896892
Logger.warning(
897-
"Identifier: #{inspect(module)}; Tries to get the table again(count: #{number})."
893+
"Identifier: #{inspect(module)} ::: MnesiaError: Tries to get the table again(count: #{number})."
898894
)
899895

900896
new_output =

0 commit comments

Comments
 (0)