diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-26 00:05:41 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-06-26 00:05:41 +0300 |
| commit | b479fe5315164e2091afc2fc379446c5c476bcb0 (patch) | |
| tree | 9dd9646bd95ca5414e269813aeec00ac3dcdb0f0 /src/ejabberd_acme.erl | |
| parent | Use proper loglevel to log resumption failures (diff) | |
Use correct stacktrace in logging macros
By calling erlang:get_stacktrace() inside a lager function
we obtain actually a stacktrace of the lager function, not
the one we got during exception. This is not a problem for
newest Erlang versions though.
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd_acme.erl | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/ejabberd_acme.erl b/src/ejabberd_acme.erl index 95e54c520..8cb1b2625 100644 --- a/src/ejabberd_acme.erl +++ b/src/ejabberd_acme.erl @@ -151,7 +151,8 @@ get_certificates(Domains) -> throw:Throw -> Throw; ?EX_RULE(E, R, St) -> - ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]), + StackTrace = ?EX_STACK(St), + ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, StackTrace]), {error, get_certificates} end; false -> @@ -243,7 +244,8 @@ get_certificate(CAUrl, DomainName, PrivateKey) -> throw:Throw -> Throw; ?EX_RULE(E, R, St) -> - ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]), + StackTrace = ?EX_STACK(St), + ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, StackTrace]), {error, DomainName, get_certificate} end. @@ -382,7 +384,8 @@ renew_certificates() -> throw:Throw -> Throw; ?EX_RULE(E, R, St) -> - ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]), + StackTrace = ?EX_STACK(St), + ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, StackTrace]), {error, get_certificates} end. @@ -447,7 +450,8 @@ list_certificates(Verbose) -> throw:Throw -> Throw; ?EX_RULE(E, R, St) -> - ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]), + StackTrace = ?EX_STACK(St), + ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, StackTrace]), {error, list_certificates} end; false -> @@ -489,7 +493,8 @@ format_certificate(DataCert, Verbose) -> end catch ?EX_RULE(E, R, St) -> - ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]), + StackTrace = ?EX_STACK(St), + ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, StackTrace]), fail_format_certificate(DomainName) end. @@ -614,7 +619,8 @@ revoke_certificates(DomainOrFile) -> throw:Throw -> Throw; ?EX_RULE(E, R, St) -> - ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]), + StackTrace = ?EX_STACK(St), + ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, StackTrace]), {error, revoke_certificate} end. @@ -1085,7 +1091,8 @@ save_certificate({ok, DomainName, Cert}) -> throw:Throw -> Throw; ?EX_RULE(E, R, St) -> - ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, ?EX_STACK(St)]), + StackTrace = ?EX_STACK(St), + ?ERROR_MSG("Unknown ~p:~p, ~p", [E, R, StackTrace]), {error, DomainName, saving} end. |