jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-14 19:18:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge 4f457d9543 into 5ffe344779

Browse source
This commit is contained in:
kongwu 2026-06-14 03:22:15 -07:00 • committed by GitHub
commit 1375141359
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libcockatrice_network/libcockatrice/network/server/remote/server.h
View file

@ -90,6 +90,10 @@ public:
{
return QString();
}
virtual SessionEvent *getLoginSessionEvent() const
{
return nullptr;
}
virtual QString getRequiredFeatures() const
{
return QString();

5
libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp
View file

@ -562,6 +562,11 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
event.set_message(server->getLoginMessage().toStdString());
rc.enqueuePostResponseItem(ServerMessage::SESSION_EVENT, prepareSessionEvent(event));
SessionEvent *loginEvent = server->getLoginSessionEvent();
if (loginEvent) {
rc.enqueuePostResponseItem(ServerMessage::SESSION_EVENT, loginEvent);
}
auto *re = new Response_Login;
re->mutable_user_info()->CopyFrom(copyUserInfo(true));

16
servatrice/src/servatrice.cpp
View file

@ -673,8 +673,22 @@ void Servatrice::statusUpdate()
}
}
SessionEvent *Servatrice::getLoginSessionEvent() const
{
// Notify newly logged-in users of a pending server shutdown
QMutexLocker locker(&shutdownStateMutex);
if (shutdownTimer && shutdownMinutes > 0) {
Event_ServerShutdown event;
event.set_reason(shutdownReason.toStdString());
event.set_minutes(static_cast<google::protobuf::uint32>(shutdownMinutes));
return Server_ProtocolHandler::prepareSessionEvent(event);
}
return nullptr;
}
void Servatrice::scheduleShutdown(const QString &reason, int minutes)
{
shutdownStateMutex.lock();
shutdownReason = reason;
shutdownMinutes = minutes;
nextShutdownMessageMinutes = shutdownMinutes;
@ -683,6 +697,7 @@ void Servatrice::scheduleShutdown(const QString &reason, int minutes)
connect(shutdownTimer, SIGNAL(timeout()), this, SLOT(shutdownTimeout()));
shutdownTimer->start(60000);
}
shutdownStateMutex.unlock();
shutdownTimeout();
}
@ -702,6 +717,7 @@ void Servatrice::incRxBytes(quint64 num)
void Servatrice::shutdownTimeout()
{
QMutexLocker locker(&shutdownStateMutex);
// Show every time counter cut in half & every minute for last 5 minutes
if (shutdownMinutes <= 5 || shutdownMinutes == nextShutdownMessageMinutes) {
if (shutdownMinutes == nextShutdownMessageMinutes) {

2
servatrice/src/servatrice.h
View file

@ -158,6 +158,7 @@ private:
Servatrice_IslServer *islServer;
mutable QMutex loginMessageMutex;
QString loginMessage;
mutable QMutex shutdownStateMutex;
QString dbPrefix;
QMap<QString, bool> serverRequiredFeatureList;
QString officialWarnings;
@ -216,6 +217,7 @@ public:
QMutexLocker locker(&loginMessageMutex);
return loginMessage;
}
SessionEvent *getLoginSessionEvent() const override;
QString getRequiredFeatures() const override;
QString getAuthenticationMethodString() const;
QString getDBTypeString() const;