From e1b234d9d00b5dd76047997bd2a98f5b2faef330 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 9 Jun 2020 02:20:35 +0100 Subject: [PATCH] change show uptime to 24hour format --- OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | 1 + OpenSim/Framework/Servers/ServerBase.cs | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 67fc3456b0..9c86e5cea8 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs @@ -598,6 +598,7 @@ namespace OpenSim.Framework.Servers.HttpServer PollServiceHttpRequest psreq = new PollServiceHttpRequest(psEvArgs, request); psEvArgs.Request?.Invoke(psreq.RequestID, osRequest); m_pollServiceManager.Enqueue(psreq); + psreq = null; } else { diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index 3be97fc22c..7140e01a14 100755 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs @@ -741,10 +741,10 @@ namespace OpenSim.Framework.Servers /// protected string GetUptimeReport() { - StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now)); - sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime)); - sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime)); - + StringBuilder sb = new StringBuilder(512); + sb.AppendFormat("Time now is {0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); + sb.AppendFormat("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime.ToString("yyyy-MM-dd HH:mm:ss")); + sb.AppendFormat("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime); return sb.ToString(); }