Merge branch 'logging' into next

diff --git a/lib/sup/imap.rb b/lib/sup/imap.rb
index 3cf6489c59ad62d6dc6cae83cb2ad0dae419062a..bdb9e15b52fec1971b7e705ffa5e0ac6988e5446 100644 (file)
--- 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 aa3ee764ac59b276d7f4ae758d4b119e141832c2..068ce6bad904c9012bdcd5d8883ac48a68e59976 100644 (file)
--- 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