From 3b53aebabdf6c9714ee7fa4c6fe4f800abdbaacc Mon Sep 17 00:00:00 2001 From: Attila Fazekas Date: Wed, 30 Apr 2014 11:57:22 +0200 Subject: [PATCH] Fedora mysql log dir is /var/log/mariadb /var/log/mysql does not exists on f20, f19, rhel7 by default, but the /var/log/mariadb exists. Change-Id: I0def3eaead491a00e6f8467db6b31502b9376188 --- lib/databases/mysql | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/databases/mysql b/lib/databases/mysql index 0a96cf8af4..ea22d14ac6 100644 --- a/lib/databases/mysql +++ b/lib/databases/mysql @@ -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"