From 4fb7cc740268ad7f146bec74d62fa88213cd5554 Mon Sep 17 00:00:00 2001
From: Proskurin Kirill <kproskurin@mirantis.com>
Date: Mon, 27 Feb 2017 11:57:41 +0000
Subject: [PATCH] Add an option to enable general and slow logs

Change-Id: Icd7907bee8c96b9002958da9bc93b429779b43b0
---
 service/files/defaults.yaml |  3 +++
 service/files/my.cnf.j2     | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index d20fb2e..2345c72 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -2,6 +2,9 @@ configs:
   service:
     database: galera
   db:
+    slow_query_log_enabled: false
+    long_query_time: 1
+    general_log_enabled: false
     root_password: "password"
     max_timeout: 60
     tls:
diff --git a/service/files/my.cnf.j2 b/service/files/my.cnf.j2
index d3f1334..a681da3 100644
--- a/service/files/my.cnf.j2
+++ b/service/files/my.cnf.j2
@@ -4,16 +4,22 @@ port = 33306
 
 datadir = /var/lib/mysql
 pid-file = /var/lib/mysql/mysqld.pid
-log-error = /var/log/ccp/mysql/mysql.log
-max_connections = 10000
-skip-name-resolve
 
+log-error = /var/log/ccp/mysql/mysql.log
+general_log = {{ '1' if db.general_log_enabled else '0' }}
+general_log_file = /var/log/ccp/mysql/general-mysql.log
+long_query_time = {{ db.long_query_time }}
+slow_query_log = {{ '1' if db.slow_query_log_enabled else '0' }}
+slow_query_log_file = /var/log/ccp/mysql/slow-mysql.log
+
+max_connections = 10000
+open_files_limit = 102400
+skip-name-resolve
 character-set-server = utf8
 collation-server = utf8_general_ci
-
-default_storage_engine = InnoDB
 binlog_format = ROW
 
+default_storage_engine = InnoDB
 innodb_autoinc_lock_mode = 2
 innodb_buffer_pool_size = 512M
 innodb_file_per_table = 1
@@ -23,8 +29,6 @@ innodb_io_capacity = 500
 innodb_read_io_threads = 8
 innodb_write_io_threads = 8
 
-open_files_limit = 102400
-
 {% if percona.sql_mode %}
 sql_mode = "{{ percona.sql_mode }}"
 {% endif -%}