Changeset 8c735aa0718a2a3a4a9072c7534b0330dc3cc003

Timestamp:

01/27/12 04:36:09 (1 year ago)

Author:

Theo Schlossnagle <jesus@lethargy.org>

git-committer:

Theo Schlossnagle <jesus@lethargy.org> 1327638969 -0800

git-parent:

[7ae62b9ec2b5f252357a0d80446c0ad5ad6dd7fa], [de30ea9a40e3c6c47f37331e1c311513058f924d]

git-author:

Theo Schlossnagle <jesus@lethargy.org> 1327638969 -0800

Message:

Merge pull request #47 from TheTeaWeevil?/master

EHLO Response Metrics Support

Files:

• src/modules-lua/Makefile.in (modified) (1 diff)
• src/modules-lua/noit/extras.lua (added)
• src/modules-lua/noit/module/smtp.lua (modified) (1 diff)
• src/modules/lua.c (modified) (1 diff)

src/modules-lua/Makefile.in

@@ -30 +30 @@
-LUA=noit/timeval.lua \
-        noit/HttpClient.lua \
+        noit/extras.lua \
-        noit/module/varnish.lua \
-        noit/module/smtp.lua \

src/modules-lua/noit/module/smtp.lua

@@ -144 +144 @@
-    local elapsed_ms = math.floor(tostring(elapsed) * 1000)
-    check.metric(phase .. "_time",  elapsed_ms)
+
+    if phase == 'ehlo' and message ~= nil then
+      local fields = noit.extras.split(message, "\r\n")
+      if fields ~= nil then
+        local response = ""
+        local extensions = ""
+        if fields[1] ~= nil then
+          response = fields[1]
+          check.metric("ehlo_response_banner", response)
+        end
+        if expected_code == actual_code and fields[1] ~= nil then
+          table.remove(fields, 1)
+          for line, value in pairs(fields) do
+            if value ~= nil and value ~= "" then
+              value = value:gsub("^%s*(.-)%s*$", "%1")
+              local subfields = noit.extras.split(value, "%s+", 1)
+              if subfields ~= nil and subfields[1] ~= nil then
+                local header = subfields[1]
+                if subfields[2] ~= nil then
+                  check.metric("ehlo_response_" .. string.lower(header), subfields[2])
+                else
+                  check.metric("ehlo_response_" .. string.lower(header), 'true')
+                end
+              end
+            end
+          end
+        end
+      end
+    end
-    return success
-  end

src/modules/lua.c

@@ -892 +892 @@
-
-  require(noit.timeval);
+  require(noit.extras);
-
-  lua_gc(L, LUA_GCRESTART, 0);