From 489b84390e375934d981d60c6ce6e9c4e190e93d Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 13 Jan 2012 23:30:00 +0000 Subject: util.throttle: Import setmetatable --- util/throttle.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/util/throttle.lua b/util/throttle.lua index 8b62e797..82b0a67b 100644 --- a/util/throttle.lua +++ b/util/throttle.lua @@ -1,5 +1,6 @@ local gettime = require "socket".gettime; +local setmetatable = setmetatable; module "throttle" -- cgit v1.2.3 From cb1415272fad53a7e73343babc4328424a6803b8 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Fri, 13 Jan 2012 23:30:32 +0000 Subject: util.throttle: Fix 'outstanding' return value --- util/throttle.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/throttle.lua b/util/throttle.lua index 82b0a67b..2e901158 100644 --- a/util/throttle.lua +++ b/util/throttle.lua @@ -34,7 +34,7 @@ function throttle:poll(cost, split) if split then self.balance = 0; end - return false, balance, (cost-self.balance); + return false, balance, (cost-balance); end end -- cgit v1.2.3 From 2929035ea843a1cd7b6279b80749822b9c56c730 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Tue, 17 Jan 2012 00:30:52 +0000 Subject: net.http: Pass response object to callbacks (feels hacky, should this be passed *instead of* the request?) --- net/http.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/http.lua b/net/http.lua index 2b2f7258..6287f408 100644 --- a/net/http.lua +++ b/net/http.lua @@ -70,7 +70,7 @@ local function request_reader(request, data, startpos) local function success_cb(r) if request.callback then for k,v in pairs(r) do request[k] = v; end - request.callback(r.body, r.code, request); + request.callback(r.body, r.code, request, r); request.callback = nil; end destroy_request(request); @@ -148,7 +148,7 @@ function request(u, ex, callback) req.handler, req.conn = server.wrapclient(conn, req.host, port, listener, "*a", using_https and { mode = "client", protocol = "sslv23" }); req.write = function (...) return req.handler:write(...); end - req.callback = function (content, code, request) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request) end, handleerr)); end + req.callback = function (content, code, request, response) log("debug", "Calling callback, status %s", code or "---"); return select(2, xpcall(function () return callback(content, code, request, response) end, handleerr)); end req.reader = request_reader; req.state = "status"; -- cgit v1.2.3