firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:03:02 +01:00
Code Issues

Don't use "None" as empty configuration file name for audit. Per Adriano request.

Browse Source
This commit is contained in:
hvlad 2009-02-02 09:12:38 +00:00
parent ec84c03937
commit 91dedb36ab
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/install/misc/firebird.conf
View File

@ -186,11 +186,11 @@
# ----------------------------
# Trace configuration file for system audit
#
# "None" value means that system audit is turned off.
# Empty value means that system audit is turned off.
#
# Type: string
#
#AuditTraceConfigFile = None
#AuditTraceConfigFile =
# ----------------------------
# Maximum summary size of each user trace session's log files in MB.

2
src/common/config/config.cpp
View File

@ -121,7 +121,7 @@ const ConfigImpl::ConfigEntry ConfigImpl::entries[] =
{TYPE_INTEGER, "MaxFileSystemCache", (ConfigValue) 65536}, // page buffers
{TYPE_BOOLEAN, "RelaxedAliasChecking", (ConfigValue) false}, // if true relax strict alias checking rules in DSQL a bit
{TYPE_BOOLEAN, "OldSetClauseSemantics", (ConfigValue) false}, // if true disallow SET A = B, B = A to exchange column values
{TYPE_STRING, "AuditTraceConfigFile", (ConfigValue) "None"}, // location of audit trace configuration file
{TYPE_STRING, "AuditTraceConfigFile", (ConfigValue) ""}, // location of audit trace configuration file
{TYPE_INTEGER, "MaxUserTraceLogSize", (ConfigValue) 10} // maximum size of user session trace log
};

6
src/jrd/trace/TraceConfigStorage.cpp
View File

@ -57,7 +57,7 @@ ConfigStorage::ConfigStorage()
if (!m_base)
{
iscLogStatus("Cannot initialize the shared memory region", status);
Firebird::status_exception::raise(status);
status_exception::raise(status);
}
fb_assert(m_base->version == 1);
@ -145,9 +145,9 @@ void ConfigStorage::checkFile()
// put default (audit) trace file contents into storage
if (m_base->change_number == 0)
{
Firebird::PathName configFileName(Config::getAuditTraceConfigFile());
PathName configFileName(Config::getAuditTraceConfigFile());
if (configFileName.empty() || configFileName.equalsNoCase("none"))
if (configFileName.empty())
return;
if (PathUtils::isRelative(configFileName)) {