From eda1e177e9227ce1a60423a77fa03e3a1f60e73d Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 17 三月 2021 17:34:29 +0800
Subject: [PATCH] 8835 【BT2】【主干】【后端】Part3-2 5)新增多日连充(领奖记录支持多个值)

---
 Tool/RemoteTool/RemoteServer/webapp.py |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/Tool/RemoteTool/RemoteServer/webapp.py b/Tool/RemoteTool/RemoteServer/webapp.py
index 89117a6..ad2220f 100644
--- a/Tool/RemoteTool/RemoteServer/webapp.py
+++ b/Tool/RemoteTool/RemoteServer/webapp.py
@@ -21,6 +21,8 @@
 from email.mime.text import MIMEText
 from email.header import Header
 import datetime
+import subprocess
+import urllib
 # get: request.query.username request.GET.get('username','')
 # post: request.forms.get('username')  request.POST.get('username')
 #===============================================================================
@@ -62,7 +64,11 @@
         pResult = pResult.read()
         if "PID" in pResult or "pid" in pResult:
             return " =======服务器已经开启,请再次确认服务器情况, EventServer.exe运行中"
-        os.system(r"call D:\ProjectServer\LaunchServerManager\正常开服.bat")
+        #os.system(r"call D:\ProjectServer\LaunchServerManager\正常开服.bat")
+        # system call会导致子进程占用父进程的文件描述符导致端口无法释放, 影响重启使用
+        # 如果需要保持子进程持续长期运行的应该调用 subprocess.Popen(cmd, close_fds=True)
+        cmd = r"D:\ProjectServer\LaunchServerManager\正常开服.bat"
+        subprocess.Popen(cmd, close_fds=True)
         return "open success"
     elif result == "close":
         # 记得关服后或者重启机器需自动启动服务器控制台
@@ -106,6 +112,21 @@
                                                        dataDict.get("userDBName", 0))
             SendEmail(ServerInfo)
             return  
+        elif stateType == "GameWarning":
+            # 游戏通用警告邮件使用
+            ServerInfo = "游戏警报:服务器组:%s, dbname:%s, 警告信息:%s"%(
+                                                       dataDict.get("groupID", 0),
+                                                       dataDict.get("userDBName", 0),
+                                                       urllib.unquote_plus(dataDict.get("MsgInfo", 0)))
+            SendEmail(ServerInfo)
+        elif stateType in ["MapServerRaiseException", "GameServerRaiseException", "RaiseException"]:
+            ServerInfo = "%s 抛出Try异常报错:服务器组:%s, dbname:%s, MapID:%s 异常信息:%s"%(
+                                                       stateType,
+                                                       dataDict.get("groupID", 0),
+                                                       dataDict.get("userDBName", 0),
+                                                       dataDict.get("mapID", 0),
+                                                       urllib.unquote_plus(dataDict.get("MsgInfo", 0)))
+            SendEmail(ServerInfo)
         elif stateType == "QueryMapOK":
             if g_AllMapCnt == 0:
                 if not os.path.exists(".\MapCount.txt"):
@@ -117,6 +138,11 @@
             return "服务器开启完毕,地图数:%s"%g_AllMapCnt
     except Exception, e:
         print e
+        ServerInfo = "控制台报错,服务器异常!  %s"%e
+        try:
+            SendEmail(ServerInfo)
+        except:
+            print "无法发送邮件"
 
 # 邮件汇报
 def SendEmail(ServerInfo):
@@ -130,7 +156,7 @@
     sender = '2199274165@qq.com'
     
     # 这里可以填写需要接收汇报的邮件地址
-    receivers = ['305670599@qq.com']#, '1142397645@qq.com']  
+    receivers = ['305670599@qq.com']#, '1142397645@qq.com', '305670599@qq.com', '995275190@qq.com']  
      
     message = MIMEText('异常汇报:%s'%ServerInfo, 'plain', 'gbk')
     message['From'] = Header("游戏服务器异常汇报", 'gbk')

--
Gitblit v1.8.0