commit ffc8f7364d2e0c16ff908ec6ea5b1134effef348
parent aef0216d7f988ab87a3430c9a65210f0d55dfc64
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Tue, 8 Sep 2009 15:25:55 -0400
Merge branch 'logging-tweaks'
Conflicts:
lib/sup/hook.rb
Diffstat:
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git 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
@@ -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