Merge branch 'logging' into next

Conflicts:
	lib/sup/hook.rb

diff --cc lib/sup/hook.rb
index 3121d41b513522f0720001059be8f99fe2c53440,d0476dad95a78429513dfcb81a311d2a3cb72c86..0212c6bc9dfe26c738cab3d7f8b90929b7dc981a
--- 1/lib/sup/hook.rb
--- 2/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]