Merge branch 'logging-tweaks'

Conflicts:
	lib/sup/hook.rb

diff --git a/bin/sup b/bin/sup
index bbb6c1711a7d5f580530a95859b4853649bf69c9..605c55342b11b1cdfd4e8fc9bfd64a98ba154129 100755 (executable)
--- a/bin/sup
+++ b/bin/sup
@@ -168,6 +168,9 @@ begin
   lmode.on_kill { Logger.clear! }
   Logger.add_sink lmode
   Logger.force_message "Welcome to Sup! Log level is set to #{Logger.level}."
+  if Logger::LEVELS.index(Logger.level) > 0
+    Logger.force_message "For more verbose logging, restart with SUP_LOG_LEVEL=#{Logger::LEVELS[Logger::LEVELS.index(Logger.level)-1]}."
+  end
 
   debug "initializing inbox buffer"
   imode = InboxMode.new

diff --git a/lib/sup/hook.rb b/lib/sup/hook.rb
index 2d6533d3b0c4eb85c46d12b262305d431bd3b3da..a2e88983cb3d7030abd845b83804828b9eb7b96b 100644 (file)
--- a/lib/sup/hook.rb
+++ b/lib/sup/hook.rb
@@ -117,10 +117,10 @@ 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}"
+        #debug "disabled hook for '#{name}': #{e.message}"
         nil
       end
     end