diff options
author | Eric Wong <e@80x24.org> | 2016-07-27 22:51:55 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2016-07-27 23:51:32 +0000 |
commit | d040466b6d53e420209412fe0566a8fe05e426e8 (patch) | |
tree | a8c02633111cba9741d4c8d0b37b0c84c56750c2 | |
parent | 6ff931c98f22db8095a2a1223d7e78f03689e264 (diff) | |
download | raindrops-d040466b6d53e420209412fe0566a8fe05e426e8.tar.gz |
rack 2.0 removes this method, but we actually don't need it since any strings we generate are binary and Aggregate#to_s output is 7-bit clean.
-rw-r--r-- | lib/raindrops/watcher.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/raindrops/watcher.rb b/lib/raindrops/watcher.rb index fb2df5b..f0abd1d 100644 --- a/lib/raindrops/watcher.rb +++ b/lib/raindrops/watcher.rb @@ -244,10 +244,10 @@ class Raindrops::Watcher def histogram_txt(agg) updated_at, reset_at, agg, current, peak = *agg headers = agg_to_hash(reset_at, agg, current, peak) - body = agg.to_s + body = agg.to_s # 7-bit ASCII-clean headers["Content-Type"] = "text/plain" headers["Expires"] = (updated_at + @delay).httpdate - headers["Content-Length"] = bytesize(body).to_s + headers["Content-Length"] = body.size.to_s [ 200, headers, [ body ] ] end @@ -265,7 +265,7 @@ class Raindrops::Watcher "</body>" headers["Content-Type"] = "text/html" headers["Expires"] = (updated_at + @delay).httpdate - headers["Content-Length"] = bytesize(body).to_s + headers["Content-Length"] = body.size.to_s [ 200, headers, [ body ] ] end @@ -364,7 +364,7 @@ class Raindrops::Watcher "for more information and options." \ "</p>" \ "</body></html>" - headers["Content-Length"] = bytesize(body).to_s + headers["Content-Length"] = body.size.to_s [ 200, headers, [ body ] ] end @@ -382,7 +382,7 @@ class Raindrops::Watcher q = Rack::Utils.parse_query env["QUERY_STRING"] @active_min = q["active_min"].to_i @queued_min = q["queued_min"].to_i - len = Rack::Utils.bytesize(addr) + len = addr.size len = 35 if len > 35 @fmt = "%20s % #{len}s % 10u % 10u\n" case env["HTTP_VERSION"] |