luci-0Ã.10: merge r7332

diff --git a/libs/lucid/luasrc/lucid.lua b/libs/lucid/luasrc/lucid.lua
index 5d62a6c..7ecdf2a 100644 (file)
--- a/libs/lucid/luasrc/lucid.lua
+++ b/libs/lucid/luasrc/lucid.lua
@@ -136,7 +136,6 @@ function run()
                        end
                elseif stat == 0 then
                        ifaddrs = nixio.getifaddrs()
-                       collectgarbage("collect")
                end
                
                for _, cb in ipairs(tickt) do
@@ -231,6 +230,8 @@ function create_process(threadcb, waitcb)
        if threadlimit and tcount >= threadlimit then
                nixio.syslog("warning", "Cannot create thread: process limit reached")
                return nil
+       else
+               collectgarbage("collect")
        end
        local pid, code, err = nixio.fork()
        if pid and pid ~= 0 then