From f2cc931fa6fd5aa5f4c54bfb20734653cf8d79b9 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Fri, 24 Feb 2017 12:09:43 +0000 Subject: [PATCH] Fix rabbitmq log ulti-line cutting problem Change-Id: Id7be86955b357199fde2ab57a9b24e1f49ecebcd Closes-Bug: #1667671 --- .../roles/common/templates/conf/input/03-rabbitmq.conf.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2 b/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2 index ac631877d4..e97c1a009c 100644 --- a/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2 +++ b/ansible/roles/common/templates/conf/input/03-rabbitmq.conf.j2 @@ -4,7 +4,7 @@ pos_file /var/run/td-agent/rabbit.pos tag rabbit.* format multiline - format_firstline /^=/ - format1 /^.*\n/ - format2 /^(?.*)\n/ + format_firstline /^\s*$/ + format1 /^=(?\w+) REPORT==== (?[^ ]+) ===\n/ + format2 /^(?.*)/