* [PATCH] drop Rack::Utils.bytesize dependency
@ 2016-07-27 22:51 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2016-07-27 22:51 UTC (permalink / raw)
To: raindrops-public
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.
---
lib/raindrops/watcher.rb | 10 +++++-----
1 file 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 @@ def agg_to_hash(reset_at, agg, current, peak)
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 @@ def histogram_html(agg, addr)
"</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 @@ def index
"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 @@ def initialize(rdmon, addr, env) # :nodoc:
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"]
--
EW
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-07-27 22:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-27 22:51 [PATCH] drop Rack::Utils.bytesize dependency Eric Wong
Code repositories for project(s) associated with this public inbox
https://yhbt.net/raindrops.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).