break resolv.conf in lines

3scale · Feb 22, 2018 · 3f2de36 · 3f2de36
1 parent 272aa57
commit 3f2de36
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/gateway/src/resty/resolver.lua b/gateway/src/resty/resolver.lua
@@ -131,13 +131,16 @@ function _M.parse_nameservers(path)
     -- see https://github.com/3scale/apicast/issues/321 for more details
     insert(nameservers, resolver)
   end
-
-  for server in gmatch(resolv_conf, 'nameserver%s+([^%s]+)') do
-    -- TODO: implement port matching based on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549190
-    if server ~= resolver then
-      insert(nameservers, nameserver.new(server))
-    end
-  end
+
+  -- for line in gmatch(resolv_conf, '[\n$]') do
+   for server in gmatch(resolv_conf, 'nameserver%s+([^%s]+)\n') do
+     -- TODO: implement port matching based on https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549190
+     if server ~= resolver then
+       ngx.log(ngx.DEBUG, 'servername: ', server)
+       insert(nameservers, nameserver.new(server))
+     end
+   end
+  -- end
 
   return nameservers
 end

diff --git a/t/resolver.t b/t/resolver.t
@@ -34,6 +34,10 @@ GET /t
 nameservers: 3 127.0.1.15353 1.2.3.453 4.5.6.753
 --- user_files
 >>> resolv.conf
+# nameserver updated  in comentary
+#nameserver updated  in comentary
+#comentary nameserver 1.2.3.4
+#comentary nameserver
 nameserver 1.2.3.4
 nameserver 4.5.6.7