aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-11-22 03:43:21 +0000
committerJustin Clark-Casey (justincc)2012-11-22 03:43:21 +0000
commit74a20a62eee8c565a9410d6896754242eb602abc (patch)
tree9cc7caa394223a8cd0e639e3a2973e4f5217e1af
parentIf an asset POST does not contain well-formed XML, return a 400 (Bad Request)... (diff)
downloadopensim-SC_OLD-74a20a62eee8c565a9410d6896754242eb602abc.zip
opensim-SC_OLD-74a20a62eee8c565a9410d6896754242eb602abc.tar.gz
opensim-SC_OLD-74a20a62eee8c565a9410d6896754242eb602abc.tar.bz2
opensim-SC_OLD-74a20a62eee8c565a9410d6896754242eb602abc.tar.xz
refactor: Factor out copy/pasted server uptime report code
-rw-r--r--OpenSim/Framework/Servers/BaseOpenSimServer.cs29
-rw-r--r--OpenSim/Framework/Servers/ServerBase.cs58
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs27
3 files changed, 66 insertions, 48 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 5b2d7dc..6346279 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -38,6 +38,8 @@ using log4net;
38using log4net.Appender; 38using log4net.Appender;
39using log4net.Core; 39using log4net.Core;
40using log4net.Repository; 40using log4net.Repository;
41using OpenMetaverse;
42using OpenMetaverse.StructuredData;
41using OpenSim.Framework; 43using OpenSim.Framework;
42using OpenSim.Framework.Console; 44using OpenSim.Framework.Console;
43using OpenSim.Framework.Monitoring; 45using OpenSim.Framework.Monitoring;
@@ -45,16 +47,12 @@ using OpenSim.Framework.Servers;
45using OpenSim.Framework.Servers.HttpServer; 47using OpenSim.Framework.Servers.HttpServer;
46using Timer=System.Timers.Timer; 48using Timer=System.Timers.Timer;
47 49
48using OpenMetaverse;
49using OpenMetaverse.StructuredData;
50
51
52namespace OpenSim.Framework.Servers 50namespace OpenSim.Framework.Servers
53{ 51{
54 /// <summary> 52 /// <summary>
55 /// Common base for the main OpenSimServers (user, grid, inventory, region, etc) 53 /// Common base for the main OpenSimServers (user, grid, inventory, region, etc)
56 /// </summary> 54 /// </summary>
57 public abstract class BaseOpenSimServer 55 public abstract class BaseOpenSimServer : ServerBase
58 { 56 {
59 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 57 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
60 58
@@ -69,11 +67,6 @@ namespace OpenSim.Framework.Servers
69 protected IAppender m_logFileAppender = null; 67 protected IAppender m_logFileAppender = null;
70 68
71 /// <summary> 69 /// <summary>
72 /// Time at which this server was started
73 /// </summary>
74 protected DateTime m_startuptime;
75
76 /// <summary>
77 /// Record the initial startup directory for info purposes 70 /// Record the initial startup directory for info purposes
78 /// </summary> 71 /// </summary>
79 protected string m_startupDirectory = Environment.CurrentDirectory; 72 protected string m_startupDirectory = Environment.CurrentDirectory;
@@ -96,9 +89,8 @@ namespace OpenSim.Framework.Servers
96 get { return m_httpServer; } 89 get { return m_httpServer; }
97 } 90 }
98 91
99 public BaseOpenSimServer() 92 public BaseOpenSimServer() : base()
100 { 93 {
101 m_startuptime = DateTime.Now;
102 m_version = VersionInfo.Version; 94 m_version = VersionInfo.Version;
103 95
104 // Random uuid for private data 96 // Random uuid for private data
@@ -284,19 +276,6 @@ namespace OpenSim.Framework.Servers
284 } 276 }
285 277
286 /// <summary> 278 /// <summary>
287 /// Return a report about the uptime of this server
288 /// </summary>
289 /// <returns></returns>
290 protected string GetUptimeReport()
291 {
292 StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now));
293 sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime));
294 sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime));
295
296 return sb.ToString();
297 }
298
299 /// <summary>
300 /// Performs initialisation of the scene, such as loading configuration from disk. 279 /// Performs initialisation of the scene, such as loading configuration from disk.
301 /// </summary> 280 /// </summary>
302 public virtual void Startup() 281 public virtual void Startup()
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
new file mode 100644
index 0000000..d19234b
--- /dev/null
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -0,0 +1,58 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Text;
30
31namespace OpenSim.Framework.Servers
32{
33 public class ServerBase
34 {
35 /// <summary>
36 /// Time at which this server was started
37 /// </summary>
38 protected DateTime m_startuptime;
39
40 public ServerBase()
41 {
42 m_startuptime = DateTime.Now;
43 }
44
45 /// <summary>
46 /// Return a report about the uptime of this server
47 /// </summary>
48 /// <returns></returns>
49 protected string GetUptimeReport()
50 {
51 StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now));
52 sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime));
53 sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime));
54
55 return sb.ToString();
56 }
57 }
58} \ No newline at end of file
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index 0cff6ed..56bb7ae 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -34,6 +34,7 @@ using System.Text;
34using System.Xml; 34using System.Xml;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Console; 36using OpenSim.Framework.Console;
37using OpenSim.Framework.Servers;
37using log4net; 38using log4net;
38using log4net.Config; 39using log4net.Config;
39using log4net.Appender; 40using log4net.Appender;
@@ -43,7 +44,7 @@ using Nini.Config;
43 44
44namespace OpenSim.Server.Base 45namespace OpenSim.Server.Base
45{ 46{
46 public class ServicesServerBase 47 public class ServicesServerBase : ServerBase
47 { 48 {
48 // Logger 49 // Logger
49 // 50 //
@@ -72,17 +73,10 @@ namespace OpenSim.Server.Base
72 // 73 //
73 private string m_pidFile = String.Empty; 74 private string m_pidFile = String.Empty;
74 75
75 /// <summary>
76 /// Time at which this server was started
77 /// </summary>
78 protected DateTime m_startuptime;
79
80 // Handle all the automagical stuff 76 // Handle all the automagical stuff
81 // 77 //
82 public ServicesServerBase(string prompt, string[] args) 78 public ServicesServerBase(string prompt, string[] args) : base()
83 { 79 {
84 m_startuptime = DateTime.Now;
85
86 // Save raw arguments 80 // Save raw arguments
87 // 81 //
88 m_Arguments = args; 82 m_Arguments = args;
@@ -373,18 +367,5 @@ namespace OpenSim.Server.Base
373 break; 367 break;
374 } 368 }
375 } 369 }
376
377 /// <summary>
378 /// Return a report about the uptime of this server
379 /// </summary>
380 /// <returns></returns>
381 protected string GetUptimeReport()
382 {
383 StringBuilder sb = new StringBuilder(String.Format("Time now is {0}\n", DateTime.Now));
384 sb.Append(String.Format("Server has been running since {0}, {1}\n", m_startuptime.DayOfWeek, m_startuptime));
385 sb.Append(String.Format("That is an elapsed time of {0}\n", DateTime.Now - m_startuptime));
386
387 return sb.ToString();
388 }
389 } 370 }
390} 371} \ No newline at end of file