mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-10-11 09:03:40 +02:00
Fixed conflict in 'ChangeLog'
This commit is contained in:
@@ -199,12 +199,24 @@ RDConfig::LogFacility RDConfig::logFacility() const
|
||||
}
|
||||
|
||||
|
||||
void RDConfig::setLogFacility(RDConfig::LogFacility log_facility)
|
||||
{
|
||||
conf_log_facility=log_facility;
|
||||
}
|
||||
|
||||
|
||||
QString RDConfig::logDirectory() const
|
||||
{
|
||||
return conf_log_directory;
|
||||
}
|
||||
|
||||
|
||||
void RDConfig::setLogDirectory(QString log_directory)
|
||||
{
|
||||
conf_log_directory=log_directory;
|
||||
}
|
||||
|
||||
|
||||
QString RDConfig::logCoreDumpDirectory() const
|
||||
{
|
||||
return conf_log_core_dump_directory;
|
||||
@@ -217,6 +229,12 @@ QString RDConfig::logPattern() const
|
||||
}
|
||||
|
||||
|
||||
void RDConfig::setLogPattern(QString log_pattern)
|
||||
{
|
||||
conf_log_pattern=log_pattern;
|
||||
}
|
||||
|
||||
|
||||
bool RDConfig::logXloadDebugData() const
|
||||
{
|
||||
return conf_log_xload_debug_data;
|
||||
|
@@ -68,9 +68,12 @@ class RDConfig
|
||||
QString mysqlEngine() const;
|
||||
QString createTablePostfix() const;
|
||||
RDConfig::LogFacility logFacility() const;
|
||||
void setLogFacility(RDConfig::LogFacility log_facility);
|
||||
QString logDirectory() const;
|
||||
void setLogDirectory(QString log_directory);
|
||||
QString logCoreDumpDirectory() const;
|
||||
QString logPattern() const;
|
||||
void setLogPattern(QString log_pattern);
|
||||
bool logXloadDebugData() const;
|
||||
void log(const QString &module,LogPriority prio,const QString &msg);
|
||||
bool provisioningCreateHost() const;
|
||||
|
Reference in New Issue
Block a user