Merge branch 'develop' into qa

* develop: 充值返利邮件新增调整压测 error

Merge branch 'develop' into qa
* develop: 充值返利邮件新增调整压测 error
zhouhaihai
2 parents 5d0e5334 d825d304
Showing 12 changed files with 176 additions and 27 deletions Show diff stats
robot/robot.lua
robot/start.lua
robot/unitTest/hero.lua
src/GlobalVar.lua
src/actions/HangAction.lua
src/actions/RoleAction.lua
src/csvdata
src/models/Activity.lua
src/models/Email.lua
src/models/RolePlugin.lua
src/services/errorlog.lua
src/services/redisd.lua
@@ -34,6 +34,9 @@ local ignoreListener = {
 	["Role.changeUpdate"] = true,
 	["Role.loadRunes"] = true,
 	["Hero.loadInfos"] = true,
+	["Store.updateproperty"] = true,
+	["Sys.maintainNotice"] = true,
+	["Hero.drawHeroExtraRewardNtf"] = true,
 	["Sys.innerErrorMsg"] = function(data)
 		local msg = MsgPack.unpack(data)
 		log("innerErrorMsg: " .. msg.id)
@@ -123,11 +126,6 @@ local function startUnit(unit)
 	unitTest.new(client):startTest()
 end
-local function handle_timeout10000()
-	rpcServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 1, pm2 = 500}))
-	rpcServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 2, pm2 = 500}))
-	skynet.timeout(10000, handle_timeout6000)
-end
 -- 登录成功开始任务
 function CMD.task()
@@ -155,6 +153,9 @@ end
 -- 退出
 function CMD.exit()
+	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "gmmsg", pm1 = "123"}))
+	skynet.sleep(50)
+	skynet.ret(skynet.pack())
 	skynet.exit()
 end
@@ -19,9 +19,9 @@ function MSG.open( ... )
 end
 function MSG.close(fd)
-	if fd2serv[fd] then
-		skynet.send(fd2serv[fd].agent, "lua", "exit")
-
+	if fd2serv[fd] and not fd2serv[fd].closing then
+		fd2serv[fd].closing = true
+		skynet.call(fd2serv[fd].agent, "lua", "exit")
 		log(string_format("logout %s", fd2serv[fd].id))
 		id2fd[fd2serv[fd].id] = nil
@@ -94,8 +94,8 @@ local function add_robot()
 	-- 定时下线
 	skynet.timeout(math.randomInt(config.online_time[1], config.online_time[2]) * 100, function()
-		socketdriver.close(fd)
 		MSG.close(fd)
+		socketdriver.close(fd)
 	end)
 end
@@ -26,7 +26,7 @@ end
 function _M:drawHero()
 	sendServer(actionCodes.Gm_clientRequest,  MsgPack.pack({cmd = "get", pm1 = 3, pm2 = 400}))
-	requestServer(actionCodes.Hero_drawHeroRpc, MsgPack.pack({pool = 1, type = 1}))
+	requestServer(actionCodes.Hero_drawHeroRpc, MsgPack.pack({pool = 2, type = 1}))
 end
 function _M:drawHero10()
@@ -293,8 +293,6 @@ MailId = {
 	SuperMonthCardEx = 204,
 	BattleCardAward = 210,
-	PaySignAward = 222,
-
 	ActSellFood = 231,
 	ActDrawCard = 232,
 	ActAdvDraw = 233,
@@ -303,6 +301,9 @@ MailId = {
 	ActDrawCardReward = 222,
 	ActAdvDrawReward = 223,
 	ActOpenBoxReward = 224,
+
+	PaySignAward = 241,
+	PayBackAward = 242,
 }
 TriggerEventType = {
@@ -278,7 +278,6 @@ function _M.endBattleRpc(agent, data)
 		local cfg = csvdb["idle_battleCsv"][nextCarbonId]
 		if cfg then
 			hangInfo.bossTime = skynet.timex() + cfg.idle_time
-			print(hangInfo.bossTime)
 		end
 	end
 	role:updateProperty({field = "hangInfo", value = hangInfo})
@@ -977,7 +977,7 @@ function _M.chatRpc(agent, data)
 	role:log("communication", {
 		publish_type = cmd, --发言类型，1，世界  2私聊 
 		publish_status = 0, --发送状态，发送成功:0，发送失败:1，被屏蔽:2，其他:3
-		publish_receive_roleid = msg.roleId, --接收者角色ID
+		publish_receive_roleid = msg.roleId or 0, --接收者角色ID
 		publish_text = content, --发言内容
 	})
 	SendPacket(actionCodes.Role_chatRpc, MsgPack.pack({result = result, waitTime = waitTime}))
-Subproject commit 9ce6c8d165817a183c2867c4e7dca9d6a5600669
+Subproject commit 5751e98613ad7ade246cb9068c6752ecca115163
@@ -334,7 +334,7 @@ activityFunc[Activity.ActivityType.PayBack] = {
 		local newVal = oldVal + twd
 		local gift = self.owner:getPaybackReward(oldVal, newVal)
 		if gift ~= "" then
-			self.owner:sendMail(MailId.MonthCard, nil, gift)
+			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal})
 		end
 		self:updateActData(actType, newVal, not notify)
 	end,
@@ -49,7 +49,7 @@ function Email:data()
 	if emailData then
 		-- 如果内容是直接插入到数据库
 		if content == "" and emailData.body ~= "" then
-			content = io.readfile("src/" .. emailData.body)
+			content = io.readfile("src/" .. emailData.body) or ""
 			content = content:format(table.unpack(contentPms))
 		end
@@ -238,7 +238,7 @@ function RolePlugin.bind(Role)
 		end
 		if params.log then
-			local log = params.log
+			local log = clone(params.log)
 			if log["cint1"] or log["cint2"] then
 				print("addPlayExp error log have cint1 or cint2  or cint3", debug.traceback())
 			end
@@ -275,7 +275,7 @@ function RolePlugin.bind(Role)
 		self:logItems(params.itemId, origin, nums, params.log)
 		if params.log then
-			local log = params.log
+			local log = clone(params.log)
 			if log["cint1"] or log["cint2"] then
 				print("addItem error log have cint1 or cint2  ", debug.traceback())
 			end
@@ -299,7 +299,7 @@ function RolePlugin.bind(Role)
 	function Role:checkItemEnough(itemCountT)
 		local less = {}
 		if not next(itemCountT) then
-			return false, less
+			return true, less
 		end
 		for itemId, count in pairs(itemCountT) do
 			if count <= 0 then
@@ -360,7 +360,7 @@ function RolePlugin.bind(Role)
 		self:logItems(ItemId.Diamond, origin, count, params.log)
 		if params.log then
-			local log = params.log
+			local log = clone(params.log)
 			if log["cint1"] or log["cint2"] or log["cint3"] then
 				print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
 			end
@@ -410,7 +410,7 @@ function RolePlugin.bind(Role)
 		self:logItems(ItemId.Diamond, origin, count, params.log)
 		if params.log then
-			local log = params.log
+			local log = clone(params.log)
 			if log["cint1"] or log["cint2"] or log["cint3"] then
 				print("costDiamond error log have cint1 or cint2 or cint3 ", debug.traceback())
 			end
@@ -459,7 +459,7 @@ function RolePlugin.bind(Role)
 		self:logItems(heroType + ItemStartId.Hero, 0, 1, params.log)
 		if params.log then
-			local log = params.log
+			local log = clone(params.log)
 			if log["cint1"] or log["cint2"] or log["cint3"] then
 				print("addHero error log have cint1 or cint2 or cint3 ", debug.traceback())
 			end
@@ -580,7 +580,7 @@ function RolePlugin.bind(Role)
 		self:logItems(equipCsv.id, oldCount, curCount, pms.log)
 		if pms.log then
-			local log = pms.log
+			local log = clone(pms.log)
 			if log["cint1"] or log["cint2"] or log["cint3"] then
 				print("addEquip error log have cint1 or cint2 or cint3 ", debug.traceback())
 			end
@@ -656,7 +656,7 @@ function RolePlugin.bind(Role)
 			self:logItems(params.id, 0, 1, params.log)
 			if params.log then
-				local log = params.log
+				local log = clone(params.log)
 				if log["cint1"] or log["cint2"] or log["cint3"] then
 					print("addRune error log have cint1 or cint2 or cint3 ", debug.traceback())
 				end
@@ -686,7 +686,7 @@ function RolePlugin.bind(Role)
 				self:logItems(rune:getProperty("id"), 1, 0, params.log)
 				if params.log then
-					local log = params.log
+					local log = clone(params.log)
 					if log["cint1"] or log["cint2"] or log["cint3"] then
 						print("delRunes error log have cint1 or cint2 or cint3 ", debug.traceback())
 					end
@@ -946,7 +946,7 @@ function RolePlugin.bind(Role)
 		self:logItems(func, 0, count, params.log)
 		if params.log then
-			local log = params.log
+			local log = clone(params.log)
 			if log["cint1"] or log["cint2"] or log["cint3"] then
 				print("funcOpen error log have cint1 or cint2 or cint3 ", debug.traceback())
 			end
@@ -0,0 +1,145 @@
+
+local skynet = require "skynet"
+local socketdriver = require "skynet.socketdriver"
+local serverId = tonumber(skynet.getenv("servId"))
+
+require "shared.init"
+require "skynet.manager"
+
+local table_insert = table.insert
+local pairs = pairs
+local ipairs = ipairs
+local string_format = string.format
+
+local logHandle = {
+	log = {
+		host = "127.0.0.1",
+		port = 13003,
+		handle = function(doc, address, msg)
+			-- 注入字段
+			local now = skynet.timex()
+			doc["time"] = now
+			doc["timestamp"] = now
+			doc["instance_id"] = serverId
+			doc["game_name"] = "wasteland"
+			doc["env"] = "cb"
+			doc["app_name"] = "gs"
+			doc["app_id"] = "game.wasteland.gs"
+			--FATAL、ERROR、WARN、INFO、DEBUG
+			doc["level"] = "ERROR"
+			doc["log"] = msg
+			doc["address"] = string_format(":%08x", address)
+		end
+	},
+}
+
+local connect_relation = {}
+local function getConInfo(fd)
+	return logHandle[connect_relation[fd] or ""]
+end
+
+
+
+local socket_message = {}
+-- read skynet_socket.h for these macro
+-- SKYNET_SOCKET_TYPE_DATA = 1
+socket_message[1] = function(id, size, data)
+	skynet.error(string.format("LOG SOCKET: data: ", skynet.tostring(data, size)))
+	socketdriver.drop(data, size)
+end
+
+-- SKYNET_SOCKET_TYPE_CONNECT = 2
+socket_message[2] = function(id, _ , addr)
+	local cur = getConInfo(id)
+	skynet.error("LOG SOCKET: connect: ", addr)
+	cur.connected = true
+	cur.connecting = false
+end
+
+-- SKYNET_SOCKET_TYPE_CLOSE = 3
+socket_message[3] = function(id)
+	skynet.error("LOG SOCKET: closed")
+	local cur = getConInfo(id)
+	if not cur then return end
+	cur.connected = false
+	cur.connecting = false
+	connect_relation[id] = nil
+end
+
+-- SKYNET_SOCKET_TYPE_ERROR = 5
+socket_message[5] = function(id, _, err)
+	skynet.error("LOG SOCKET: error: ", err)
+	local cur = getConInfo(id)
+	if not cur then return end
+	cur.connected = false
+	cur.connecting = false
+	connect_relation[id] = nil
+end
+
+
+
+local function open()
+	for logTo, data in pairs(logHandle) do
+		if not data.connecting  and not data.connected then
+			data.connecting = true
+			data.fd = socketdriver.connect(data.host, data.port)
+			connect_relation[data.fd] = logTo
+		end
+	end
+end
+
+local function log(address, msg, logTo)
+	logTo = logTo or "log"
+	-- print(string.format(":%08x(%.2f): %s", address, skynet.time(), msg))
+	local cur = logHandle[logTo] 
+	if not cur then
+		print("error log to ", logTo)
+	end
+	local doc = {}
+	if cur.handle then
+		cur.handle(doc, address, msg)
+	end
+	if cur.connected and cur.fd then
+		socketdriver.send(cur.fd, json.encode(doc) .. "\n")
+	else
+		-- 断线会丢失一部分日志
+		if not cur.connecting then
+			open() -- 连一下
+		end
+	end
+end
+
+
+skynet.register_protocol {
+	name = "socket",
+	id = skynet.PTYPE_SOCKET,	-- PTYPE_SOCKET = 6
+	unpack = socketdriver.unpack,
+	dispatch = function (_, _, t, ...)
+		if socket_message[t] then
+			socket_message[t](...)
+		end
+	end
+}
+
+-- register protocol text before skynet.start would be better.
+skynet.register_protocol {
+	name = "text",
+	id = skynet.PTYPE_TEXT,
+	unpack = skynet.tostring,
+	dispatch = function(_, address, msg)
+		log(address, msg)
+	end
+}
+
+skynet.register_protocol {
+	name = "SYSTEM",
+	id = skynet.PTYPE_SYSTEM,
+	unpack = function(...) return ... end,
+	dispatch = function()
+		-- reopen signal
+		print("SIGHUP")
+	end
+}
+
+open()
+skynet.start(function()end)
@@ -24,5 +24,8 @@ skynet.start(function()
 			skynet.ret(skynet.pack(db[string.lower(cmd)](db, ...)))
 		end
 	end)
+	skynet.info_func(function()
+		skynet.ret(skynet.pack(skynet.call(skynet.self(), "debug", "STAT")))
+	end)
 	skynet.register ".redis"
 end)
 \ No newline at end of file