openstack/kolla
Code Issues Proposed changes

Revert "Add general_log to mariadb container and make heka collect it"

Browse Source 
This reverts commit 86bafeee7a.

Closes-Bug: #1568670

Change-Id: I88563292e29d691c27a3640e5232b9f22c7a288a
This commit is contained in:
Vikram Hosakote 2016-04-06 17:33:59 +00:00
parent 12735f01da
commit df53d92db6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/common/templates/heka-mariadb.toml.j2
View File

@ -6,6 +6,6 @@ filename = "lua_decoders/os_mysql_log.lua"
type = "LogstreamerInput"
decoder = "mariadb_log_decoder"
log_directory = "/var/log/kolla"
file_match = 'mariadb/(mariadb|mariadb-error)\.log\.?(?P<Seq>\d*)$'
file_match = 'mariadb/mariadb\.log\.?(?P<Seq>\d*)$'
priority = ["^Seq"]
differentiator = ['mariadb']

4
ansible/roles/mariadb/templates/galera.cnf.j2
View File

@ -3,9 +3,7 @@
bind-address={{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}
port={{ mariadb_port }}
log-error=/var/log/kolla/mariadb/mariadb-error.log
general_log=1
general_log_file=/var/log/kolla/mariadb/mariadb.log
log-error=/var/log/kolla/mariadb/mariadb.log
binlog_format=ROW
default-storage-engine=innodb