Changeset de30ea9a40e3c6c47f37331e1c311513058f924d

Timestamp:

01/26/12 16:13:49 (1 year ago)

Author:

Philip Maddox <pmaddox@circonus.com>

git-committer:

Philip Maddox <pmaddox@circonus.com> 1327594429 -0500

git-parent:

[4a0da0e513a734ae484e56cee0fdc99f321e3766]

git-author:

Philip Maddox <pmaddox@circonus.com> 1327594429 -0500

Message:

Moved split from smtp.lua into extras.lua, a new file for extra non-task-specific functions. Added extras.lua to the build.

Files:

• src/modules-lua/Makefile.in (modified) (1 diff)
• src/modules-lua/noit/extras.lua (added)
• src/modules-lua/noit/module/smtp.lua (modified) (3 diffs)
• 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

@@ -146 +146 @@
-
-    if phase == 'ehlo' and message ~= nil then
-string
+noit.extras
-      if fields ~= nil then
-        local response = ""
@@ -159 +159 @@
-            if value ~= nil and value ~= "" then
-              value = value:gsub("^%s*(.-)%s*$", "%1")
-string
+noit.extras
-              if subfields ~= nil and subfields[1] ~= nil then
-                local header = subfields[1]
@@ -243 +243 @@
-end
-
--- from http://www.wellho.net/resources/ex.php4?item=u108/split
--- modified to split up to 'max' times
-function string:split(delimiter, max)
-  local result = { }
-  local from  = 1
-  local delim_from, delim_to = string.find( self, delimiter, from  )
-  local nb = 0
-  if max == nil then
-    max = 0
-  end
-  while delim_from do
-    local insert_string = string.sub( self, from , delim_from-1 )
-    nb = nb + 1
-    table.insert( result, insert_string )
-    from  = delim_to + 1
-    delim_from, delim_to = string.find( self, delimiter, from  )
-    if nb == max then
-      break
-    end
-  end
-  local last_res = string.sub (self, from)
-  if last_res ~= nil and last_res ~= "" then
-    table.insert( result, last_res )
-  end
-  return result
-end
-

src/modules/lua.c

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