diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-22 11:41:38 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-22 11:41:38 -0500 |
| commit | e12f073f6532f78ee4d94e1d343c80c830fc7a66 (patch) | |
| tree | fdb355f666d16d049398132838370553c7921ec1 | |
| parent | Merge pull request #1601 (diff) | |
| parent | Make stack trace show up in log file with default settings (diff) | |
| download | monero-e12f073f6532f78ee4d94e1d343c80c830fc7a66.tar.xz | |
Merge pull request #1604
a854cec3 Make stack trace show up in log file with default settings (moneromooo-monero)
| -rw-r--r-- | contrib/epee/src/mlog.cpp | 4 | ||||
| -rw-r--r-- | src/common/stack_trace.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index f1d74a2a3..d35fcf993 100644 --- a/contrib/epee/src/mlog.cpp +++ b/contrib/epee/src/mlog.cpp @@ -121,10 +121,10 @@ void mlog_set_log_level(int level) switch (level) { case 0: - settings = "*:FATAL,net*:FATAL,global:INFO,verify:FATAL"; + settings = "*:FATAL,net*:FATAL,global:INFO,verify:FATAL,stacktrace:INFO"; break; case 1: - settings = "*:WARNING,global:INFO"; + settings = "*:WARNING,global:INFO,stacktrace:INFO"; break; case 2: settings = "*:INFO"; diff --git a/src/common/stack_trace.cpp b/src/common/stack_trace.cpp index ce05b7e04..99e4bda2c 100644 --- a/src/common/stack_trace.cpp +++ b/src/common/stack_trace.cpp @@ -38,7 +38,7 @@ #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "stacktrace" -#define ST_LOG(x) CERROR(el::base::Writer,el::base::DispatchAction::FileOnlyLog,MONERO_DEFAULT_LOG_CATEGORY) << x +#define ST_LOG(x) CINFO(el::base::Writer,el::base::DispatchAction::FileOnlyLog,MONERO_DEFAULT_LOG_CATEGORY) << x // from http://stackoverflow.com/questions/11665829/how-can-i-print-stack-trace-for-caught-exceptions-in-c-code-injection-in-c |