From: Steven Barth <steven@midlink.org>
Date: Wed, 27 May 2009 13:20:35 +0000 (+0000)
Subject: LuCId fixes
X-Git-Tag: 0.9.0~309
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=06a3956a2ff31943bbd8c989df9033617135f703;p=project%2Fluci.git

LuCId fixes
---

diff --git a/libs/lucid/luasrc/lucid.lua b/libs/lucid/luasrc/lucid.lua
index d72bf25ef9..34452a5991 100644
--- a/libs/lucid/luasrc/lucid.lua
+++ b/libs/lucid/luasrc/lucid.lua
@@ -176,7 +176,7 @@ end
 
 function create_process(threadcb, waitcb)
 	local threadlimit = tonumber(cursor:get(UCINAME, "main", "threadlimit"))
-	if threadlimit and #tpids >= tcount then
+	if threadlimit and tcount >= threadlimit then
 		nixio.syslog("warning", "Unable to create thread: process limit reached")
 		return nil
 	end
diff --git a/libs/lucid/root/etc/config/lucid b/libs/lucid/root/etc/config/lucid
index bfbb4ca1dd..7baf6db3ef 100644
--- a/libs/lucid/root/etc/config/lucid
+++ b/libs/lucid/root/etc/config/lucid
@@ -1,7 +1,7 @@
 config lucid main
 	option pollinterval 15000
 	option threadlimit 25
-	option daemon 1
+	option daemonize 1
 	option debug 0
 	list supports tcpserver
 	list supports server
diff --git a/libs/lucid/root/etc/init.d/lucid b/libs/lucid/root/etc/init.d/lucid
index 125dc7bf5d..1b2b04ed4e 100755
--- a/libs/lucid/root/etc/init.d/lucid
+++ b/libs/lucid/root/etc/init.d/lucid
@@ -9,13 +9,13 @@ set -e
 
 start() {
 	echo -n "Starting $DESC: $NAME"
-	lua -e 'require "luci.lucid".start()'
+	lua -lluci.lucid -e 'luci.lucid.start()'
 	echo "."
 }
 
 stop() {
 	echo -n "Stopping $DESC: $NAME"
-	lua -e 'require "luci.lucid".stop()'
+	lua -lluci.lucid -e 'luci.lucid.stop()'
 	echo "."
 }