graphite: use TCP timeout value derived from publish interval

It seems pointless to accumulate "late" connection attempts.

diff --git a/modules/graphite/graphite.lua b/modules/graphite/graphite.lua
index 902913f8c133bf92088e5a25dab77bcd4509f5b5..e2ac67eb09e7917d5cd2817bb4e05921595312d2 100644 (file)
--- a/modules/graphite/graphite.lua
+++ b/modules/graphite/graphite.lua
@@ -13,10 +13,18 @@ local proto_txt = {
 
 local function make_socket(host, port, stype)
        local s, err, status
+       -- timeout before next interval begins (roughly)
+       local timeout_sec = (M.interval - 10) / sec
 
        s = socket.connect({ host = host, port = port, type = stype })
        s:setmode('bn', 'bn')
-       status, err = pcall(s.connect, s)
+       s:settimeout(timeout_sec)
+       status, err = pcall(s.connect, s, timeout_sec)
+       if status == true and err == nil then
+               err = 'connect timeout'
+               s:close()
+               status = false
+       end
 
        if not status then
                log('[graphite] connecting: %s@%d %s reason: %s',