Merge branch 'logging' into next

Conflicts:
	lib/sup/hook.rb

diff --git a/lib/sup/hook.rb b/lib/sup/hook.rb
index 3121d41b513522f0720001059be8f99fe2c53440..0212c6bc9dfe26c738cab3d7f8b90929b7dc981a 100644 (file)
--- a/lib/sup/hook.rb
+++ b/lib/sup/hook.rb
@@ -119,7 +119,7 @@ private
     unless @hooks.member? name
       @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}"