diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-12 11:56:25 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-12 11:56:25 +0000 |
| commit | f2a91397fd7f9ca5bb3d296ec6df2de6f9cfc7cb (patch) | |
| tree | eac0f28e2e8c5940a6c0212c059e0dd11185499e /lib/webrick | |
| parent | 0d7718896cfb629ad823b9ca5004465ef2063ab8 (diff) | |
| download | ruby-f2a91397fd7f9ca5bb3d296ec6df2de6f9cfc7cb.tar.gz | |
Add uplevel keyword to Kernel#warn and use it
If uplevel keyword is given, the warning message is prepended
with caller file and line information and the string "warning: ".
The use of the uplevel keyword makes Kernel#warn format output
similar to how rb_warn formats output.
This patch modifies net/ftp and net/imap to use Kernel#warn
instead of $stderr.puts or $stderr.printf, since they are used
for printing warnings.
This makes lib/cgi/core and tempfile use $stderr.puts instead of
warn for debug logging, since they are used for debug printing
and not for warning.
This does not modify bundler, rubygems, or rdoc, as those are
maintained outside of ruby and probably wish to remain backwards
compatible with older ruby versions.
rb_warn_m code is originally from nobu, but I've changed it
so that it only includes the path and lineno from uplevel
(not the method), and also prepends the string "warning: ",
to make it more similar to rb_warn.
From: Jeremy Evans code@jeremyevans.net
Signed-off-by: Urabe Shyouhei shyouhei@ruby-lang.org
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/webrick')
| -rw-r--r-- | lib/webrick/server.rb | 2 | ||||
| -rw-r--r-- | lib/webrick/utils.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 06b7f9fde3..88e160d981 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -103,7 +103,7 @@ module WEBrick @shutdown_pipe = nil unless @config[:DoNotListen] if @config[:Listen] - warn(":Listen option is deprecated; use GenericServer#listen") + warn(":Listen option is deprecated; use GenericServer#listen", uplevel: 1) end listen(@config[:BindAddress], @config[:Port]) if @config[:Port] == 0 diff --git a/lib/webrick/utils.rb b/lib/webrick/utils.rb index 68833af96e..07044876b9 100644 --- a/lib/webrick/utils.rb +++ b/lib/webrick/utils.rb @@ -37,7 +37,7 @@ module WEBrick Process::Sys::setgid(pw.gid) Process::Sys::setuid(pw.uid) else - warn("WEBrick::Utils::su doesn't work on this platform") + warn("WEBrick::Utils::su doesn't work on this platform", uplevel: 1) end end module_function :su |