From 4cc1058bfe861d7cfb8feca47ffe915505817859 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bogdando@mail.ru>
Date: Mon, 15 Jul 2013 17:37:29 +0300
Subject: [PATCH] Use rsyslog::imfile for rabbitmq

Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
---
 deployment/puppet/openstack/manifests/logging.pp | 14 --------------
 deployment/puppet/rsyslog/manifests/client.pp    | 15 +++++++++++++++
 deployment/puppet/rsyslog/manifests/imfile.pp    |  3 ++-
 deployment/puppet/rsyslog/templates/imfile.erb   |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/deployment/puppet/openstack/manifests/logging.pp b/deployment/puppet/openstack/manifests/logging.pp
index 5cd903f17d..d7f4811db9 100644
--- a/deployment/puppet/openstack/manifests/logging.pp
+++ b/deployment/puppet/openstack/manifests/logging.pp
@@ -55,13 +55,6 @@ if $role == 'client' {
     syslog_log_facility_nova => $syslog_log_facility_nova,
     syslog_log_facility_keystone => $syslog_log_facility_keystone,
   }
-# FIXME Find more appropriate way to ensure rsyslog service would be restarted
-# while custom runstage openstack::logging class has been called within
-#  exec {'rsyslog_forcerestart':
-#    path    => ["/usr/bin", "/usr/sbin", "/sbin", "/bin"],
-#    command => "service ${::rsyslog::params::service_name} restart",
-#    returns => 0,
-#  }
 
 } else { # server
   firewall { "$port $proto rsyslog":
@@ -82,13 +75,6 @@ if $role == 'client' {
     high_precision_timestamps => $show_timezone,
     virtual    => $virtual,
   }
-# FIXME Find more appropriate way to ensure rsyslog service would be restarted
-# while custom runstage openstack::logging class has been called within
-#  exec {'rsyslog_forcerestart':
-#    path    => ["/usr/bin", "/usr/sbin", "/sbin", "/bin"],
-#    command => "service ${::rsyslog::params::service_name} restart",
-#    returns => 0,
-#  }
 }
 
   class {"::openstack::logrotate":
diff --git a/deployment/puppet/rsyslog/manifests/client.pp b/deployment/puppet/rsyslog/manifests/client.pp
index ba913b916e..dc32ce5ba3 100644
--- a/deployment/puppet/rsyslog/manifests/client.pp
+++ b/deployment/puppet/rsyslog/manifests/client.pp
@@ -43,6 +43,21 @@ if $virtual { include rsyslog::checksum_udp514 }
     notify  => Class["rsyslog::service"],
   }
 
+# Rabbitmq does not support syslogging, use imfile
+  ::rsyslog::imfile { "04-rabbitmq" :
+    file_name     => "/var/log/rabbitmq/rabbit@${hostname}.log",
+    file_tag      => "rabbitmq",
+    file_facility => "syslog",
+    notify  => Class["rsyslog::service"],
+  }
+
+  ::rsyslog::imfile { "04-rabbitmq-sasl" :
+    file_name     => "/var/log/rabbitmq/rabbit@${hostname}-sasl.log",
+    file_tag      => "rabbitmq-sasl",
+    file_facility => "syslog",
+    notify  => Class["rsyslog::service"],
+  }
+
   file { "${rsyslog::params::rsyslog_d}02-ha.conf":
     ensure => present,
     content => template("${module_name}/02-ha.conf.erb"),
diff --git a/deployment/puppet/rsyslog/manifests/imfile.pp b/deployment/puppet/rsyslog/manifests/imfile.pp
index 64e6e2f92f..4ff9d17c8f 100644
--- a/deployment/puppet/rsyslog/manifests/imfile.pp
+++ b/deployment/puppet/rsyslog/manifests/imfile.pp
@@ -1,3 +1,4 @@
+#
 define rsyslog::imfile(
   $file_name,
   $file_tag,
@@ -13,7 +14,7 @@ define rsyslog::imfile(
     owner   => 'root',
     group   => $rsyslog::params::run_group,
     content => template('rsyslog/imfile.erb'),
-    require => Class['rsyslog::install'],
+    #require => Class['rsyslog::install'],
     notify  => Class['rsyslog::service'],
   }
 }
diff --git a/deployment/puppet/rsyslog/templates/imfile.erb b/deployment/puppet/rsyslog/templates/imfile.erb
index b389663bc9..35bcfdbcdb 100644
--- a/deployment/puppet/rsyslog/templates/imfile.erb
+++ b/deployment/puppet/rsyslog/templates/imfile.erb
@@ -7,7 +7,7 @@ $InputFileTag <%= file_tag %>
 $InputFileStateFile state-<%= name %>
 $InputFileSeverity <%= file_severity %>
 $InputFileFacility <%= file_facility %>
-$InputFilePollingInterval <%= polling_interval %>
+$InputFilePollInterval <%= polling_interval %>
 <% if run_file_monitor == true -%>
 $InputRunFileMonitor
 <% end -%>