From: Eric Wong <e@80x24.org>
To: raindrops-public@bogomips.org
Subject: [PATCH] drop Rack::Utils.bytesize dependency
Date: Wed, 27 Jul 2016 22:51:55 +0000 [thread overview]
Message-ID: <20160727225155.30453-1-e@80x24.org> (raw)
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
reply other threads:[~2016-07-27 22:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://yhbt.net/raindrops/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160727225155.30453-1-e@80x24.org \
--to=e@80x24.org \
--cc=raindrops-public@bogomips.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
http://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).