From e646122f5506ec0fdc3d57e48902c915e0cf44ae Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Wed, 22 Apr 2015 17:34:43 +0200
Subject: [PATCH 1/2] Updated server shutdown timer logic

Will follow the following rules

+ send a message initially
+ send a message every 20 mins
+ send a message every min when time <= 5

Updated client popup

Updated client to close any previous popups and bring up a new one.

NEEDS TO BE TESTED

added missing include

Added delete on close
---
 cockatrice/src/window_main.cpp |  8 ++++++-
 cockatrice/src/window_main.h   |  3 +++
 servatrice/src/servatrice.cpp  | 43 ++++++++++++++++++----------------
 servatrice/src/servatrice.h    |  1 +
 4 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/cockatrice/src/window_main.cpp b/cockatrice/src/window_main.cpp
index 61c248c9..bd1f998d 100644
--- a/cockatrice/src/window_main.cpp
+++ b/cockatrice/src/window_main.cpp
@@ -86,7 +86,13 @@ void MainWindow::processConnectionClosedEvent(const Event_ConnectionClosed &even
 
 void MainWindow::processServerShutdownEvent(const Event_ServerShutdown &event)
 {
-    QMessageBox::information(this, tr("Scheduled server shutdown"), tr("The server is going to be restarted in %n minute(s).\nAll running games will be lost.\nReason for shutdown: %1", "", event.minutes()).arg(QString::fromStdString(event.reason())));
+    if (serverShutdownMessageBox)
+        serverShutdownMessageBox->close();
+    serverShutdownMessageBox = new QMessageBox(this);
+    serverShutdownMessageBox->setAttribute(Qt::WA_DeleteOnClose);
+    serverShutdownMessageBox->setInformativeText(tr("The server is going to be restarted in %n minute(s).\nAll running games will be lost.\nReason for shutdown: %1", "", event.minutes()).arg(QString::fromStdString(event.reason())));
+    serverShutdownMessageBox->setText(tr("Scheduled server shutdown"));
+    serverShutdownMessageBox->exec();
 }
 
 void MainWindow::statusChanged(ClientStatus _status)
diff --git a/cockatrice/src/window_main.h b/cockatrice/src/window_main.h
index d52be9bd..8993fc72 100644
--- a/cockatrice/src/window_main.h
+++ b/cockatrice/src/window_main.h
@@ -31,6 +31,7 @@ class LocalClient;
 class LocalServer;
 class ServerInfo_User;
 class QThread;
+class QMessageBox;
 
 class MainWindow : public QMainWindow {
     Q_OBJECT
@@ -86,6 +87,8 @@ private:
     
     LocalServer *localServer;
     bool bHasActivated;
+
+    QMessageBox *serverShutdownMessageBox;
 public:
     MainWindow(QWidget *parent = 0);
     ~MainWindow();
diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 335e740b..058ee31c 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -126,7 +126,7 @@ void Servatrice_IslServer::incomingConnection(qintptr socketDescriptor)
 }
 
 Servatrice::Servatrice(QObject *parent)
-    : Server(true, parent), uptime(0), shutdownTimer(0)
+    : Server(true, parent), uptime(0), shutdownTimer(0), isFirstShutdownMessage(true)
 {
     qRegisterMetaType<QSqlDatabase>("QSqlDatabase");
 }
@@ -485,26 +485,29 @@ void Servatrice::shutdownTimeout()
 {
     --shutdownMinutes;
 
-    SessionEvent *se;
-    if (shutdownMinutes) {
-        Event_ServerShutdown event;
-        event.set_reason(shutdownReason.toStdString());
-        event.set_minutes(shutdownMinutes);
-        se = Server_ProtocolHandler::prepareSessionEvent(event);
-    } else {
-        Event_ConnectionClosed event;
-        event.set_reason(Event_ConnectionClosed::SERVER_SHUTDOWN);
-        se = Server_ProtocolHandler::prepareSessionEvent(event);
+    if (shutdownMinutes <= 5 || isFirstShutdownMessage || shutdownMinutes % 20 == 0) {
+        isFirstShutdownMessage = false;
+        SessionEvent *se;
+        if (shutdownMinutes) {
+            Event_ServerShutdown event;
+            event.set_reason(shutdownReason.toStdString());
+            event.set_minutes(shutdownMinutes);
+            se = Server_ProtocolHandler::prepareSessionEvent(event);
+        } else {
+            Event_ConnectionClosed event;
+            event.set_reason(Event_ConnectionClosed::SERVER_SHUTDOWN);
+            se = Server_ProtocolHandler::prepareSessionEvent(event);
+        }
+
+        clientsLock.lockForRead();
+        for (int i = 0; i < clients.size(); ++i)
+            clients[i]->sendProtocolItem(*se);
+        clientsLock.unlock();
+        delete se;
+    
+        if (!shutdownMinutes)
+            deleteLater();
     }
-
-    clientsLock.lockForRead();
-    for (int i = 0; i < clients.size(); ++i)
-        clients[i]->sendProtocolItem(*se);
-    clientsLock.unlock();
-    delete se;
-
-    if (!shutdownMinutes)
-        deleteLater();
 }
 
 bool Servatrice::islConnectionExists(int serverId) const
diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h
index e7e548d1..717e5ab8 100644
--- a/servatrice/src/servatrice.h
+++ b/servatrice/src/servatrice.h
@@ -120,6 +120,7 @@ private:
 	QString shutdownReason;
 	int shutdownMinutes;
 	QTimer *shutdownTimer;
+    bool isFirstShutdownMessage;
 	
 	mutable QMutex serverListMutex;
 	QList<ServerProperties> serverList;

From 66f854fe1d2a39583079d682b799110902059169 Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Thu, 23 Apr 2015 00:26:21 +0200
Subject: [PATCH 2/2] Changed to check every 10 mins

---
 servatrice/src/servatrice.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp
index 058ee31c..66a9c977 100644
--- a/servatrice/src/servatrice.cpp
+++ b/servatrice/src/servatrice.cpp
@@ -485,7 +485,7 @@ void Servatrice::shutdownTimeout()
 {
     --shutdownMinutes;
 
-    if (shutdownMinutes <= 5 || isFirstShutdownMessage || shutdownMinutes % 20 == 0) {
+    if (shutdownMinutes <= 5 || isFirstShutdownMessage || shutdownMinutes % 10 == 0) {
         isFirstShutdownMessage = false;
         SessionEvent *se;
         if (shutdownMinutes) {