db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-12 10:04:14 +02:00
Code Issues Releases Activity

Show exact log level required for stack trace param output instead of just "debug".

Browse Source
This commit is contained in:
David Steele 2018-07-20 07:15:28 -04:00
parent 0ac176b722
commit fa53e2eddb
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/xml/release.xml
View File

@ -60,6 +60,10 @@
<p>Require <postgres/> catalog version when instantiating a <code>Manifest</code> object (and not loading it from disk).</p>
</release-item>
<release-item>
<p>Show exact log level required for stack trace param output instead of just <quote>debug</quote>.</p>
</release-item>
</release-development-list>
</release-core-list>

4
src/common/stackTrace.c
View File

@ -177,7 +177,9 @@ stackTraceParamIdx(int stackIdx)
return data->param;
}
return "debug log level required for parameters";
// If no parameters return the log level required to get them
#define LOG_LEVEL_REQUIRED " log level required for parameters"
return data->functionLogLevel == logLevelTrace ? "trace" LOG_LEVEL_REQUIRED : "debug" LOG_LEVEL_REQUIRED;
}
const char *

5
test/src/module/common/stackTraceTest.c
View File

@ -103,9 +103,10 @@ testRun()
" check stack trace");
#endif
assert(stackTracePush("file1.c", "function2", logLevelDebug) == logLevelDebug);
assert(stackTracePush("file1.c", "function2", logLevelTrace) == logLevelTrace);
stackTrace[stackSize - 2].fileLine = 7777;
assert(strcmp(stackTraceParam(), "debug log level required for parameters") == 0);
assert(strcmp(stackTraceParam(), "trace log level required for parameters") == 0);
stackTrace[stackSize - 1].functionLogLevel = logLevelDebug;
TRY_BEGIN()
{