From: William Morgan <wmorgan-sup@masanjin.net>
Date: Sat, 22 Aug 2009 14:33:41 +0000 (-0400)
Subject: Merge branch 'logging' into next
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=ef1d8a9333f8d261deeb88a7c1cb0cc58d7b6563;hp=f5d9f2ce214a3f90e9716a8b2dc35dc74ef5a9de;p=sup

Merge branch 'logging' into next
---

diff --git a/lib/sup/imap.rb b/lib/sup/imap.rb
index 3cf6489..bdb9e15 100644
--- a/lib/sup/imap.rb
+++ b/lib/sup/imap.rb
@@ -276,7 +276,7 @@ private
 
   def say s
     @say_id = BufferManager.say s, @say_id if BufferManager.instantiated?
-    debug s
+    info s
   end
 
   def shutup
diff --git a/lib/sup/util.rb b/lib/sup/util.rb
index aa3ee76..068ce6b 100644
--- a/lib/sup/util.rb
+++ b/lib/sup/util.rb
@@ -654,7 +654,7 @@ class Iconv
     begin
       Iconv.iconv(target + "//IGNORE", charset, text + " ").join[0 .. -2]
     rescue Errno::EINVAL, Iconv::InvalidEncoding, Iconv::InvalidCharacter, Iconv::IllegalSequence => e
-      info "couldn't transcode text from #{charset} to #{target} (\"#{text[0 ... 20]}\"...)"
+      warn "couldn't transcode text from #{charset} to #{target} (\"#{text[0 ... 20]}\"...) (got #{e.message}); using original as is"
       text
     end
   end