From 875e507166259a02838907943e5dd383e4dd7d16 Mon Sep 17 00:00:00 2001 From: zhouhaihai Date: Fri, 27 Mar 2020 17:11:15 +0800 Subject: [PATCH] 服务名称修改 --- src/services/agent_ctrl.lua | 2 +- src/services/chated.lua | 2 +- src/services/csvdatad.lua | 2 +- src/services/dbseed.lua | 3 +-- src/services/globald.lua | 14 ++++++++------ src/services/httpweb.lua | 3 +-- src/services/named.lua | 2 +- src/services/redisd.lua | 2 +- src/services/watchdog.lua | 13 +++++++++---- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/services/agent_ctrl.lua b/src/services/agent_ctrl.lua index 46a94d4..e891188 100644 --- a/src/services/agent_ctrl.lua +++ b/src/services/agent_ctrl.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 diff --git a/src/services/chated.lua b/src/services/chated.lua index aec8020..d66a765 100644 --- a/src/services/chated.lua +++ b/src/services/chated.lua @@ -35,7 +35,7 @@ if mode == "sub" 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() diff --git a/src/services/csvdatad.lua b/src/services/csvdatad.lua index f65a431..d740367 100644 --- a/src/services/csvdatad.lua +++ b/src/services/csvdatad.lua @@ -111,5 +111,5 @@ skynet.start(function () skynet.ret(skynet.pack(f(...))) end) - skynet.register "CSVDATA" + skynet.register(".CSVDATA") end) diff --git a/src/services/dbseed.lua b/src/services/dbseed.lua index ee212aa..92df467 100644 --- a/src/services/dbseed.lua +++ b/src/services/dbseed.lua @@ -5,7 +5,6 @@ require "GlobalVar" 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") diff --git a/src/services/globald.lua b/src/services/globald.lua index bf120ea..8306214 100644 --- a/src/services/globald.lua +++ b/src/services/globald.lua @@ -8,15 +8,14 @@ require "utils.init" 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__) diff --git a/src/services/httpweb.lua b/src/services/httpweb.lua index 5ec07d4..8b5b762 100644 --- a/src/services/httpweb.lua +++ b/src/services/httpweb.lua @@ -13,7 +13,6 @@ mcast_util = require "services/mcast_util" 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) diff --git a/src/services/named.lua b/src/services/named.lua index 1d771fa..91e0e56 100644 --- a/src/services/named.lua +++ b/src/services/named.lua @@ -35,7 +35,7 @@ if mode == "sub" 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() diff --git a/src/services/redisd.lua b/src/services/redisd.lua index 25673d4..47fa12f 100644 --- a/src/services/redisd.lua +++ b/src/services/redisd.lua @@ -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 diff --git a/src/services/watchdog.lua b/src/services/watchdog.lua index 0410326..cb04815 100644 --- a/src/services/watchdog.lua +++ b/src/services/watchdog.lua @@ -8,6 +8,7 @@ local snax = require "skynet.snax" 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 "shared.init" 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") -- libgit2 0.21.2