Merge pull request #462 from lurkermike/master

(#12402) split log messages into individual lines before sending to syslog
puppetlabs · Feb 8, 2012 · 76d05c2 · 76d05c2
2 parents 9859517 + b89da8c
commit 76d05c2
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lib/puppet/util/log/destinations.rb b/lib/puppet/util/log/destinations.rb
@@ -30,12 +30,16 @@ def handle(msg)
     # cannot log a message with a '%' in it.  So, we get rid
     # of them.
     if msg.source == "Puppet"
-      @syslog.send(msg.level, msg.to_s.gsub("%", '%%'))
+      msg.to_s.split("\n").each do |line|
+        @syslog.send(msg.level, line.gsub("%", '%%'))
+      end
     else
-      @syslog.send(msg.level, "(%s) %s" % [msg.source.to_s.gsub("%", ""),
-          msg.to_s.gsub("%", '%%')
-        ]
-      )
+      msg.to_s.split("\n").each do |line|
+        @syslog.send(msg.level, "(%s) %s" % [msg.source.to_s.gsub("%", ""),
+            line.gsub("%", '%%')
+          ]
+        )
+      end
     end
   end
 end