summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2009-05-27 13:20:35 +0000
committerSteven Barth <steven@midlink.org>2009-05-27 13:20:35 +0000
commit06a3956a2ff31943bbd8c989df9033617135f703 (patch)
treed9c995bb22b26dc3e049355fead2217a6be67ed6
parent632abafabf6a1f3011fffd9cff9f5b65258ec1d2 (diff)
LuCId fixes
-rw-r--r--libs/lucid/luasrc/lucid.lua2
-rw-r--r--libs/lucid/root/etc/config/lucid2
-rwxr-xr-xlibs/lucid/root/etc/init.d/lucid4
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/lucid/luasrc/lucid.lua b/libs/lucid/luasrc/lucid.lua
index d72bf25ef..34452a599 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 bfbb4ca1d..7baf6db3e 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 125dc7bf5..1b2b04ed4 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 "."
}