Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
IRMA
Github mirrors
irmago
Commits
04e6adae
Commit
04e6adae
authored
Jan 31, 2019
by
Sietse Ringers
Browse files
Log stack traces at debug level
parent
bc23e0c5
Changes
2
Hide whitespace changes
Inline
Side-by-side
server/api.go
View file @
04e6adae
...
...
@@ -78,7 +78,7 @@ func RemoteError(err Error, message string) *irma.RemoteError {
"error"
:
err
.
Type
,
"message"
:
message
,
})
.
Warnf
(
"Sending session error"
)
if
Logger
.
IsLevelEnabled
(
logrus
.
Trace
Level
)
{
if
Logger
.
IsLevelEnabled
(
logrus
.
Debug
Level
)
{
stack
=
string
(
debug
.
Stack
())
Logger
.
Warn
(
stack
)
}
...
...
@@ -255,7 +255,7 @@ func TypeString(x interface{}) string {
func
log
(
level
logrus
.
Level
,
err
error
)
error
{
writer
:=
Logger
.
WithFields
(
logrus
.
Fields
{
"err"
:
TypeString
(
err
)})
.
WriterLevel
(
level
)
if
e
,
ok
:=
err
.
(
*
errors
.
Error
);
ok
&&
Logger
.
IsLevelEnabled
(
logrus
.
Trace
Level
)
{
if
e
,
ok
:=
err
.
(
*
errors
.
Error
);
ok
&&
Logger
.
IsLevelEnabled
(
logrus
.
Debug
Level
)
{
_
,
_
=
writer
.
Write
([]
byte
(
e
.
ErrorStack
()))
}
else
{
_
,
_
=
writer
.
Write
([]
byte
(
fmt
.
Sprintf
(
"%s"
,
err
.
Error
())))
...
...
@@ -266,7 +266,7 @@ func log(level logrus.Level, err error) error {
func
LogFatal
(
err
error
)
error
{
logger
:=
Logger
.
WithFields
(
logrus
.
Fields
{
"err"
:
TypeString
(
err
)})
// using log() for this doesn't seem to do anything
if
e
,
ok
:=
err
.
(
*
errors
.
Error
);
ok
&&
Logger
.
IsLevelEnabled
(
logrus
.
Trace
Level
)
{
if
e
,
ok
:=
err
.
(
*
errors
.
Error
);
ok
&&
Logger
.
IsLevelEnabled
(
logrus
.
Debug
Level
)
{
logger
.
Fatal
(
e
.
ErrorStack
())
}
else
{
logger
.
Fatalf
(
"%s"
,
err
.
Error
())
...
...
server/irmaserver/irmad/main.go
View file @
04e6adae
...
...
@@ -85,7 +85,7 @@ func main() {
func
die
(
err
*
errors
.
Error
)
{
msg
:=
err
.
Error
()
if
logger
.
IsLevelEnabled
(
logrus
.
Trace
Level
)
{
if
logger
.
IsLevelEnabled
(
logrus
.
Debug
Level
)
{
msg
+=
"
\n
Stack trace:
\n
"
+
string
(
err
.
Stack
())
}
logger
.
Fatal
(
msg
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment