diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-04-28 16:59:29 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-04-28 16:59:29 +0200 |
| commit | 66e18cc92f41d7e4206b75063fdd4d0f24a12241 (patch) | |
| tree | 0e6ee0b48a86f2b192cc127e88ceb6c4c574e9eb | |
| parent | Merge pull request #3695 (diff) | |
| parent | mlog: fix setting no logs (diff) | |
| download | monero-66e18cc92f41d7e4206b75063fdd4d0f24a12241.tar.xz | |
Merge pull request #3703
18c2f6e2 mlog: fix setting no logs (moneromooo-monero)
| -rw-r--r-- | contrib/epee/src/mlog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/epee/src/mlog.cpp b/contrib/epee/src/mlog.cpp index 5b9472006..fb0b4ac2b 100644 --- a/contrib/epee/src/mlog.cpp +++ b/contrib/epee/src/mlog.cpp @@ -202,7 +202,12 @@ void mlog_set_log(const char *log) long level; char *ptr = NULL; - level = strtoll(log, &ptr, 10); + if (!*log) + { + mlog_set_categories(log); + return; + } + level = strtol(log, &ptr, 10); if (ptr && *ptr) { // we can have a default level, eg, 2,foo:ERROR |