From: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 1 Sep 2009 02:38:15 +0000 (-0400)
Subject: Merge branch 'logging' into next
X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=c7e58d5ea766bc23e3b38d1b7c033ea02093dab8;p=sup

Merge branch 'logging' into next

Conflicts:
	lib/sup/hook.rb
---

c7e58d5ea766bc23e3b38d1b7c033ea02093dab8
diff --cc lib/sup/hook.rb
index 3121d41,d0476da..0212c6b
--- a/lib/sup/hook.rb
+++ b/lib/sup/hook.rb
@@@ -117,14 -127,15 +117,14 @@@ privat
  
    def hook_for name
      unless @hooks.member? name
 -      @hooks[name] =
 -        begin
 -          returning IO.read(fn_for(name)) do
 -            debug "read '#{name}' from #{fn_for(name)}"
 -          end
 -        rescue SystemCallError => e
 -          #log "disabled hook for '#{name}': #{e.message}"
 -          nil
 +      @hooks[name] = begin
 +        returning IO.read(fn_for(name)) do
-           log "read '#{name}' from #{fn_for(name)}"
++          debug "read '#{name}' from #{fn_for(name)}"
          end
 +      rescue SystemCallError => e
 +        #log "disabled hook for '#{name}': #{e.message}"
 +        nil
 +      end
      end
  
      @hooks[name]