Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 09:03:40 +02:00
Code Issues Projects Releases Wiki Activity

2021-04-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 'Collations=' directive to the [mySQL] section of
	rd.conf(5).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-04-26 19:12:01 -04:00
parent 070e655f55
commit 6664a99f59
8 changed files with 92 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rdconfig.cpp
View File

@@ -217,6 +217,12 @@ QString RDConfig::mysqlEngine() const
}
QString RDConfig::mysqlCollation() const
{
return conf_mysql_collation;
}
QString RDConfig::createTablePostfix() const
{
return conf_create_table_postfix;
@@ -585,6 +591,8 @@ bool RDConfig::load()
DEFAULT_MYSQL_HEARTBEAT_INTERVAL);
conf_mysql_engine=
profile->stringValue("mySQL","Engine",DEFAULT_MYSQL_ENGINE);
conf_mysql_collation=
profile->stringValue("mySQL","Collation",DEFAULT_MYSQL_COLLATION);
conf_create_table_postfix=
RDConfig::createTablePostfix(conf_mysql_engine);
@@ -690,6 +698,7 @@ void RDConfig::clear()
conf_mysql_driver="";
conf_mysql_heartbeat_interval=DEFAULT_MYSQL_HEARTBEAT_INTERVAL;
conf_mysql_engine=DEFAULT_MYSQL_ENGINE;
conf_mysql_collation=DEFAULT_MYSQL_COLLATION;
conf_create_table_postfix="";
conf_log_xload_debug_data=false;
conf_provisioning_create_host=false;

2
lib/rdconfig.h
View File

@@ -62,6 +62,7 @@ class RDConfig
QString mysqlDriver() const;
int mysqlHeartbeatInterval() const;
QString mysqlEngine() const;
QString mysqlCollation() const;
QString createTablePostfix() const;
bool logXloadDebugData() const;
bool provisioningCreateHost() const;
@@ -133,6 +134,7 @@ class RDConfig
QString conf_mysql_password;
QString conf_mysql_driver;
QString conf_mysql_engine;
QString conf_mysql_collation;
QString conf_create_table_postfix;
int conf_mysql_heartbeat_interval;
bool conf_provisioning_create_host;