test

Makefile

@@ -14,9 +14,9 @@ LUA_STATICLIB := ./skynet/3rd/lua/liblua.a
 LUA_LIB ?= $(LUA_STATICLIB)
 LUA_INC ?= ./skynet/3rd/lua
 
-LUA_CLIB = cjson websocketnetpack clientwebsocket
+LUA_CLIB = cjson websocketnetpack clientwebsocket lfs
 
-all	: $(LUA_CLIB_PATH)/cjson.so $(LUA_CLIB_PATH)/websocketnetpack.so $(LUA_CLIB_PATH)/clientwebsocket.so
+all	: $(LUA_CLIB_PATH)/cjson.so $(LUA_CLIB_PATH)/websocketnetpack.so $(LUA_CLIB_PATH)/clientwebsocket.so $(LUA_CLIB_PATH)/lfs.so
 
 $(LUA_CLIB_PATH)/cjson.so : lua-cjson/fpconv.c lua-cjson/strbuf.c lua-cjson/lua_cjson.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) -Ilua-cjson $^ -o $@
@@ -27,6 +27,9 @@ $(LUA_CLIB_PATH)/websocketnetpack.so : lualib-src/lua-websocketnetpack.c | $(LUA
 $(LUA_CLIB_PATH)/clientwebsocket.so : lualib-src/lua-clientwebsocket.c | $(LUA_CLIB_PATH)
 	$(CC) $(CFLAGS) $(SHARED) $^ -o $@ -lpthread
 
+$(LUA_CLIB_PATH)/lfs.so : luafilesystem/src/lfs.c | $(LUA_CLIB_PATH)
+	$(CC) $(CFLAGS) $(SHARED) -Iluafilesystem/src $^ -o $@
+
 clean :
 	rm -f $(LUA_CLIB_PATH)/*.so
 

config/item.lua

@@ -1,5 +1,5 @@
 return {
-    [1] = {id=1, desc = "this is ggggttttitem one"},
+    [1] = {id=1, desc = "this is item one"},
     [2] = {id=1, desc = "this is item two"},
 }
 

etc/config

@@ -14,7 +14,7 @@ nodename = "node1"
 
 --logger = "logd"
 --logservice = "snlua"
---logfilename = "test"
+--logfilename = "logtest"
 --logfilemaxline = 2
 
 

etc/runconfig.lua

@@ -4,7 +4,7 @@ return {
 
     node1 = {
         -- 当前节点控制台监听端口
-        debug_console_port = 8801,
+        debug_console_port = 8701,
         -- agent 池配置
         agentpool = {
             name = "agent", -- 要启动缓存的 agent 文件名
@@ -24,7 +24,7 @@ return {
         login_num = 2,    
 
         watchdog = {
-            port = 8899,
+            port = 8799,
             maxclient = 1024,
             nodelay = true,
         }

lualib/lfstool.lua

@@ -0,0 +1,26 @@
+local lfs = require "lfs"
+
+local M = {}
+
+
+local sep = string.match (package.config, "[^\n]+")
+function M.attrdir(path)
+    for file in lfs.dir(path) do
+        if file ~= "." and file ~= ".." then
+            local f = path .. sep .. file
+            print("\t=> " .. f .. " <=")
+            local attr = lfs.attributes(f)
+            assert(type(attr) == "table")
+            if attr.mode == "directory" then
+                M.attrdir(f)
+            else
+                for name, value in pairs(attr) do
+                    print(name, value)
+                end
+            end
+        end
+    end
+end
+
+return M
+

lualib/libwsagentpool.lua

@@ -0,0 +1,23 @@
+local skynet = require "skynet"
+
+local M = {}
+
+local agentpool
+local function init()
+    agentpool = skynet.queryservice("agentpool")
+end
+
+
+function M.get()
+    return skynet.call(agentpool, "lua", "get")
+end
+
+function M.recycle(agent)
+    return skynet.call(agentpool, "lua", "recycle", agent)
+end
+
+skynet.init(init)
+
+return M
+
+

lualib/setup.lua

@@ -6,41 +6,54 @@ local env = require "env"
 
 local M = env.dispatch
 
-local list = {
-    "test",
-    "item",
-}
-
 local function update()
     skynet.timeout(100, 
         function() 
-            print("update all") 
             M.update_all()  
             update()
         end )
 end
 
+local function dir(path)
+    local lfs = require "lfs"
+    local ret = {}
+    for file in lfs.dir(path) do
+        if file ~= "." and file ~= ".." then
+            local file = string.match(file, "(%w+)%.lua")
+            if file then
+                table.insert(ret, file)
+            end
+        end
+    end
+    return ret
+end
+
 local reload = require "reload"
 local function init()
+    local list = dir("config")
     for k, v in pairs(list) do
+        log.debug("init " .. v .. " conf")
         local conf = reload.loadmod(v)
         builder.new(v, conf)
     end
-    update()
 end
 
 
 function M.update_all()
     for k, v in pairs(list) do
         local conf = reload.loadmod(v)
         builder.update(v, conf)
+        log.debug("update conf: " .. v)
     end
 end
 
 function M.update(name)
-    local conf = require(name)
-    builder.update(v, conf)
+    local conf = reload.loadmod(name)
+    builder.update(name, conf)
+    log.debug("update conf: " .. name)
 end
 
 skynet.init(init)
 
+
+

service/dbproxyd.lua

@@ -1,3 +1,3 @@
-require "service"
+require "service"  
 require "dbproxy"
 

service/main.lua

@@ -13,6 +13,9 @@ skynet.start(function()
     skynet.uniqueservice("debug_console", nodeconf.debug_console_port)
     log.debug("start debug_console in port: " .. nodeconf.debug_console_port)
 
+    log.debug("start setupd...")
+    skynet.newservice("setupd")
+
     log.debug("start dbproxyd...")
     for i = 1, nodeconf.dbproxy_num do
         local name = string.format(".dbproxyd%d", i)

test.lua

@@ -13,6 +13,7 @@ function string.split(input, delimiter)
     return arr
 end
 
+
 local t = string.split("hello.world", ".")
 for k, v in pairs(t) do
     print("v: " .. v)