服务名称修改

zhouhaihai
1 parent df883a11
Showing 9 changed files with 24 additions and 19 deletions Show diff stats
src/services/agent_ctrl.lua
src/services/chated.lua
src/services/csvdatad.lua
src/services/dbseed.lua
src/services/globald.lua
src/services/httpweb.lua
src/services/named.lua
src/services/redisd.lua
src/services/watchdog.lua
@@ -128,7 +128,7 @@ function _M:check_agent_status()
 		next_log_time = now + 60
 		local count = table_nums(self.u2f)
 		datacenter.set("onlineCount", count)
-		pcall(skynet.send, logd, "lua", "log", "online", {count = count})
+		pcall(skynet.send, logd, "lua", "log", "online", {count = count}, "online")
 	end
 end
@@ -35,7 +35,7 @@ if mode == &quot;sub&quot; then
 			skynet.ret(skynet.pack(f(...)))
 		end)
-		skynet.register(string.format("CHATED%d", id))
+		skynet.register(string.format(".CHATED%d", id))
 	end)
 else
 	skynet.start(function()
@@ -111,5 +111,5 @@ skynet.start(function ()
 		skynet.ret(skynet.pack(f(...)))
 	end)
-	skynet.register "CSVDATA"
+	skynet.register(".CSVDATA")
 end)
@@ -5,7 +5,6 @@ require &quot;GlobalVar&quot;
 require "RedisKeys"
 require "ProtocolCode"
 require "skynet.manager"
-local harbor = require "skynet.harbor"
 skynet = require "skynet"
@@ -37,7 +36,7 @@ local steps = {
 }
 skynet.start(function ()
-	redisd = harbor.queryname("REDIS")
+	redisd = skynet.localname(".REDIS")
 	redisproxy = require("shared.redisproxy")
@@ -8,15 +8,14 @@ require &quot;utils.init&quot;
 require "RedisKeys"
 require "skynet.manager"
+
 local ipairs = ipairs
 local table_insert = table.insert
 local tarr2tab = table.array2Table
 local string_format = string.format
-local pointDataMark = {}
-local utils = {}
-local CHECK_MAIL_STATUS_INTERVAL 	= 60
+local CHECK_MAIL_STATUS_INTERVAL 	= 100 * 60
 local function mailQuene()
 	local delayEmail = tonum(redisproxy:hget("autoincrement_set", "delay_email"))
 	if delayEmail == 0 then
@@ -95,6 +94,8 @@ end
 local CMD = {}
+
+-- 服务器缓存50条消息
 local cacheWorldMsg = {}
 local CACHE_WORLD_MSG_COUNT = 50
 function CMD.sendWorldMsg(channel, msg)
@@ -105,12 +106,12 @@ function CMD.sendWorldMsg(channel, msg)
 	end
 end
-
 function CMD.getWorldMsg(channel)
 	local msgs = cacheWorldMsg[channel] or {}
 	return msgs
 end
+
 function CMD.start()
 	check_mail_queue()
 end
@@ -127,8 +128,9 @@ local function __init__()
 			end
 		end
 	end)
-	redisd = harbor.queryname("REDIS")
-	skynet.register("GLOBALD")
+	redisd = skynet.localname(".REDIS")
+	skynet.register(".GLOBALD")
+
 end
 skynet.start(__init__)
@@ -13,7 +13,6 @@ mcast_util = require &quot;services/mcast_util&quot;
 globalCsv = require "csvdata/GlobalDefine"
 local socket = require "skynet.socket"
-local harbor = require "skynet.harbor"
 require "shared.init"
 require "utils.init"
@@ -55,7 +54,7 @@ end
 local CMD = require "actions.HttpAction"
 local function start()
-	redisd = harbor.queryname("REDIS")
+	redisd = skynet.localname(".REDIS")
 	csvdb = sharedata.query("csvdata")
 	local listen_socket = socket.listen("0.0.0.0", port)
@@ -35,7 +35,7 @@ if mode == &quot;sub&quot; then
 			skynet.ret(skynet.pack(f(...)))
 		end)
-		skynet.register(string.format("NAMED%d", id))
+		skynet.register(string.format(".NAMED%d", id))
 	end)
 else
 	skynet.start(function()
@@ -24,5 +24,5 @@ skynet.start(function()
 			skynet.ret(skynet.pack(db[string.lower(cmd)](db, ...)))
 		end
 	end)
-	skynet.register "REDIS"
+	skynet.register ".REDIS"
 end)
 \ No newline at end of file
@@ -8,6 +8,7 @@ local snax = require &quot;skynet.snax&quot;
 local agent_ctrl = require "services.agent_ctrl"
 local xxtea = require "xxtea"
 local mc = require "skynet.multicast"
+local cluster = require "skynet.cluster"
 require "ProtocolCode"
 require "GlobalVar"
@@ -15,7 +16,7 @@ require &quot;shared.init&quot;
 require "utils.init"
 local CMD, SOCKET = {}, {}
-local globald
+local globald, pvpd
 local pool_size = tonumber(...)
@@ -77,11 +78,15 @@ function CMD.start(conf)
 	-- roomServer = skynet.newservice("services/roomServer")
 	-- skynet.call(roomServer, "lua", "start")
+	skynet.newservice("services/dbseed")
+
 	globald = skynet.newservice("services/globald")
 	skynet.call(globald, "lua", "start")
-	skynet.newservice("services/dbseed")
-
+	pvpd = skynet.newservice("services/pvpd")
+	cluster.register("pvpd", pvpd)
+	local servId = tonumber(skynet.getenv("servId"))
+	cluster.open("server" .. servId)
 end
 function CMD.forceClose(fd)
@@ -103,7 +108,7 @@ skynet.start(function()
 			skynet.ret(skynet.pack(f(subcmd, ...)))
 		end
 	end)
-	skynet.register "WATCHDOG"
+	skynet.register ".WATCHDOG"
 	-- 数据库服务
 	redisd = skynet.newservice("services/redisd")