Revert "12345 技能测试1"

hxp

2025-08-20 d0a3a9fc96782d1ae4fd0b110681de7c9ab089f5

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
ó 
¡Žâfc@sedd
lZddl
m
Z

ddlmZ
dd    d„ƒYZdd
d„ƒYZd
ad„Zd
S(iÿÿÿÿN(
ttime(
tmylogtMergeServerProxyClientc
Bs;eZ
dZd
„Zd„Zd„Zd„Zd„ZRS(icCsC|
|_||_
||_||_d
|_t|_d
|_dS(Ni(t    sessionIDt
clientGUIDtgroupIDtclientIPt*_MergeServerProxyClient__lastHeartbeatTicktTruetisValidt._MergeServerProxyClient__lastSendHeartbeatTick(tselfRRRR((s&.\\ServersRoute\MergeProxyClientMgr.pyt__init__s
    
    
    
    
    
    c

Cstƒ|_
dS(
N(RR(
R((s&.\\ServersRoute\MergeProxyClientMgr.pytrefreshHeartbeats
c
Cs+tƒ}
|
|j
|jd
kr'tStS(Ni(RRtHeartbeatIntervalRtFalse(Rtnow((s&.\\ServersRoute\MergeProxyClientMgr.pytcheckHeartbeats
    

c
CsG|js t
Stƒ}
|j|
kr)t
S|
|j|jkrCt
StS(
N(R
RRRR(RR((s&.\\ServersRoute\MergeProxyClientMgr.pytshouldSendHeartbeat s
    

    


c

Cstƒ|_
dS(
N(RR
(
R((s&.\\ServersRoute\MergeProxyClientMgr.pytrefreshSendHeartbeatTick,s
(t__name__t
__module__RRR RRR(((s&.\\ServersRoute\MergeProxyClientMgr.pyR
s

    
            tMergeServerProxyClientMgrc
BsYeZ
d„Zd
„Zd„Zd„Zd„Zd„Zd„Zd„Z    d„Z
RS(    c

Csi|_i|_
i|_dS(
N(t*_MergeServerProxyClientMgr__sessionIDIndext+_MergeServerProxyClientMgr__clientGUIDIndext1_MergeServerProxyClientMgr__operatorServerIDIndex(
R((s&.\\ServersRoute\MergeProxyClientMgr.pyR1s
    
    
cCs|jj
|
ƒ
S(
N(Rtget(Rtguid((s&.\\ServersRoute\MergeProxyClientMgr.pytfindClientByGUID6s
c
Cs|
S(
N((RR((s&.\\ServersRoute\MergeProxyClientMgr.pytgetCompoundKey9s
c
Cs´|
|jkrdS|jj
|
ƒ
}|j}|j}|j}|jj
|dƒ
|jj
|j|ƒ
dƒ
t    j
d
|
|||t|jƒ
t|jƒ
t|jƒ
fƒ

dS(Ns)merge: delClient %s %s %s %s ... %s-%s-%s(RtpopRRRRtNoneRRR
tinfotlen(RRtclientRRR((s&.\\ServersRoute\MergeProxyClientMgr.pyt    delClient<s



    
    
    






cCsC|
|j|
j
<|
|j|
j<|j|
jƒ
}|
|j|<dS(
N(RRRRRRR(RR"tcompoundKey((s&.\\ServersRoute\MergeProxyClientMgr.pyt    addClientKs



c
Cs3
|j|ƒ
}|rDt
jd
|ƒ

tjd|||fƒ

dS|jj|
ƒ
r…t
jd|
ƒ

tjd|
||fƒ

dS|jj|j|ƒ
ƒ
rÌt
jd|ƒ

tjd||fƒ

dSt    |
|||ƒ}|j
|ƒ

t
jd|
|||t|jƒ
t|jƒ
t|jƒ
fƒ

dS(    s 2024-9-2 ÐÂÔöÁËsessionID¶Ï¿ªÁ´½Óʱͬ²½ delClient
                                Ô­ÏÈsession¶Ï¿ªÊ±£¬Ã»ÓÐɾ³ýÏà¹ØÁª×Ó·þ£¬¿ÉÄܵ¼Ö»ñÈ¡µ½Ò»¸öÒѾ­¶Ï¿ªµÄ²»´æÔÚclient
            OnMergeMsgToClientList °´groupIDÁбí¹ã²¥Ö¸¶¨×Ó·þ·¶Î§ÐÅϢʱ»á¶àÓàÉêÇëÁ˲»´æÔÚ·þÎñÆ÷µÄ·¢ËÍpack£¬µ¼Ö²»ÊͷŶÔÏó³Ø
            
                                Ð޸ĺó£¬Ôö¼ÓÁË delClient Í¬²½É¾³ý¶ÔÓ¦clientÏà¹Ø¶ÔÏó¹ÜÀí£¬¼´Á´½ÓʱÀíÂÛÉÏÒ»¶¨ÊÇÒ»¸öеĠclient£¬Í¬¸ö»ú×Ó¶ÏÏßÖØÁ¬Í¬ÑùÊÓΪеÄclient
                                ¿ÉÄÜ´æÔÚÒÔÏÂÇé¿ö£¬¾ùÊÓΪÒì³£Çé¿ö£¬»á½øÐл㱨Óʼþ¾¯¸æÌáÐÑ
            1. Öظ´µÄclientGUIDÁ´½Ó£¬¼´ÔÚÔ­clientGUIDÒѾ­´æÔÚµÄÇé¿ö£¬ÓÐÖظ´µÄclientGUIDÁ´½Ó£¬¿ÉÄÜÊÇÔËά¿½±´Ð»ú×ÓguidûÓÐÖØÐÂÉú³ÉµÄÔ­Òò
            2. Öظ´µÄgroupID£¬Ô­ÒòͬÉÏ£¬¿ÉÄÜgroupIDûÓÐÐÞ¸Ä
            3. Öظ´µÄsessionID
        s'###error merge: addClient clientGUID %ssmerge clientGUID %s, %s, %sNs&###error merge: addClient sessionID %ssmerge sessionID %s, %s, %ss$###error merge: addClient groupID %ssmerge groupID %s, %ss.merge: addClient %s %s %s %s login... %s-%s-%s( RR
R tPegasusCollectorProxytErrorReportRthas_keyRRRR%R!R(RRRRRR"((s&.\\ServersRoute\MergeProxyClientMgr.pytupdateClientQs(










 




cCs|j|
ƒ
}|j
j|ƒ
S(
N(RRR(RRR$((s&.\\ServersRoute\MergeProxyClientMgr.pytfindClientByCompoundKeyts

cCs|jj
|
ƒ
S(
N(RR(RR((s&.\\ServersRoute\MergeProxyClientMgr.pytfindClientBySessionIDxs
c


Cs |jj
ƒS(
N(Rtvalues(
R((s&.\\ServersRoute\MergeProxyClientMgr.pyt getClientList{s
(RRRRRR#R%R)R*R+R-(((s&.\\ServersRoute\MergeProxyClientMgr.pyR0s
                        #        c
Cstst
ƒantS(
N(t__gMergeProxyClientMgrR(((s&.\\ServersRoute\MergeProxyClientMgr.pytgetMergeProxyClientMgr€s

(((    R&RtCommonR
RRRR.R/(((s&.\\ServersRoute\MergeProxyClientMgr.pyt<module>s


&N