openstack/devstack
Code Issues Proposed changes

Merge "Fedora mysql log dir is /var/log/mariadb"

Browse Source
This commit is contained in:
Jenkins 2014-05-02 18:20:14 +00:00 committed by Gerrit Code Review
commit 0daf26b880
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/databases/mysql
View File

@ -47,6 +47,7 @@ function recreate_database_mysql {
}
function configure_database_mysql {
local slow_log
echo_summary "Configuring and starting MySQL"
if is_ubuntu; then
@ -92,7 +93,11 @@ function configure_database_mysql {
if [[ "$DATABASE_QUERY_LOGGING" == "True" ]]; then
echo_summary "Enabling MySQL query logging"
if is_fedora && ! [[ $DISTRO =~ (rhel6) ]]; then
slow_log=/var/log/mariadb/mariadb-slow.log
else
slow_log=/var/log/mysql/mysql-slow.log
fi
sudo sed -e '/log.slow.queries/d' \
-e '/long.query.time/d' \
-e '/log.queries.not.using.indexes/d' \
@ -102,7 +107,7 @@ function configure_database_mysql {
# 0 seconds) and log all non-indexed queries
sudo bash -c "source $TOP_DIR/functions && \
iniset $MY_CONF mysqld slow-query-log 1 && \
iniset $MY_CONF mysqld slow-query-log-file /var/log/mysql/mysql-slow.log && \
iniset $MY_CONF mysqld slow-query-log-file $slow_log && \
iniset $MY_CONF mysqld long-query-time 0 && \
iniset $MY_CONF mysqld log-queries-not-using-indexes 1"