luci-0.9: merge r5130-r5143

[project/luci.git] / libs / lucid / luasrc / lucid / tcpserver.lua

diff --git a/libs/lucid/luasrc/lucid/tcpserver.lua b/libs/lucid/luasrc/lucid/tcpserver.lua
index 584da22..2d82246 100644 (file)
--- a/libs/lucid/luasrc/lucid/tcpserver.lua
+++ b/libs/lucid/luasrc/lucid/tcpserver.lua
@@ -105,9 +105,12 @@ function prepare_daemon(config, server)
 end
 
 function accept(polle)
+       if not lucid.try_process() then
+               return false
+       end
        local socket, host, port = polle.fd:accept()
        if not socket then
-               return nixio.syslog("warn", "accept() failed: " .. port)
+               return nixio.syslog("warning", "accept() failed: " .. port)
        end
        
        socket:setblocking(true)
@@ -197,7 +200,7 @@ function prepare_tls(tlskey)
                                return nixio.syslog("err", "Unable to load PX5G Keymaster")
                        end
                        
-                       nixio.syslog("info", "PX5G: Generating " .. bits .. "b private key") 
+                       nixio.syslog("warning", "PX5G: Generating private key")
                        local rk = px5g.genkey(bits)
                        local keyfile = nixio.open(key, "w", 600)
                        if not rk or not keyfile or not keyfile:writeall(rk:asn1()) then
@@ -205,7 +208,7 @@ function prepare_tls(tlskey)
                        end
                        keyfile:close()
                        
-                       nixio.syslog("info", "PX5G: Generating self-signed certificate")
+                       nixio.syslog("warning", "PX5G: Generating self-signed certificate")
                        if not fs.writefile(cert, rk:create_selfsigned(data,
                                        os.time(), os.time() + 3600 * 24 * 366 * 15)) then
                                return nixio.syslog("err", "Unable to generate certificate")