diff options
author | Melanie Thielker | 2009-05-05 02:37:04 +0000 |
---|---|---|
committer | Melanie Thielker | 2009-05-05 02:37:04 +0000 |
commit | 91ce6c90b5aca66b891987f71585c6be8c68b698 (patch) | |
tree | 3bab03df9cee2fc608f01fc9ab8a339510c971b5 /OpenSim | |
parent | Add the missing reference to fix windows build break (diff) | |
download | opensim-SC_OLD-91ce6c90b5aca66b891987f71585c6be8c68b698.zip opensim-SC_OLD-91ce6c90b5aca66b891987f71585c6be8c68b698.tar.gz opensim-SC_OLD-91ce6c90b5aca66b891987f71585c6be8c68b698.tar.bz2 opensim-SC_OLD-91ce6c90b5aca66b891987f71585c6be8c68b698.tar.xz |
Committing the HTTP (REST) server base
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Servers/Base/HttpServerBase.cs | 81 | ||||
-rw-r--r-- | OpenSim/Servers/Base/ServicesServerBase.cs | 2 |
2 files changed, 82 insertions, 1 deletions
diff --git a/OpenSim/Servers/Base/HttpServerBase.cs b/OpenSim/Servers/Base/HttpServerBase.cs new file mode 100644 index 0000000..f36c6c9 --- /dev/null +++ b/OpenSim/Servers/Base/HttpServerBase.cs | |||
@@ -0,0 +1,81 @@ | |||
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 OpenSim 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 | |||
28 | using System; | ||
29 | using System.Threading; | ||
30 | using System.Reflection; | ||
31 | using OpenSim.Framework.Console; | ||
32 | using OpenSim.Framework.Servers.HttpServer; | ||
33 | using log4net; | ||
34 | using Nini.Config; | ||
35 | |||
36 | namespace OpenSim.Servers.Base | ||
37 | { | ||
38 | public class HttpServerBase : ServicesServerBase | ||
39 | { | ||
40 | // Logger | ||
41 | // | ||
42 | private static readonly ILog m_log = | ||
43 | LogManager.GetLogger( | ||
44 | MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | |||
46 | // The http server instance | ||
47 | // | ||
48 | protected BaseHttpServer m_HttpServer = null; | ||
49 | |||
50 | // Handle all the automagical stuff | ||
51 | // | ||
52 | public HttpServerBase(string prompt, string[] args) : base(prompt, args) | ||
53 | { | ||
54 | } | ||
55 | |||
56 | protected override void ReadConfig() | ||
57 | { | ||
58 | IConfig networkConfig = m_Config.Configs["Network"]; | ||
59 | |||
60 | if (networkConfig == null) | ||
61 | { | ||
62 | System.Console.WriteLine("Section 'Network' not found, server can't start"); | ||
63 | Thread.CurrentThread.Abort(); | ||
64 | } | ||
65 | uint port = (uint)networkConfig.GetInt("port", 0); | ||
66 | |||
67 | if (port == 0) | ||
68 | { | ||
69 | System.Console.WriteLine("Port number not specified or 0, server can't start"); | ||
70 | Thread.CurrentThread.Abort(); | ||
71 | } | ||
72 | |||
73 | m_HttpServer = new BaseHttpServer(port); | ||
74 | } | ||
75 | |||
76 | protected override void Initialise() | ||
77 | { | ||
78 | m_HttpServer.Start(); | ||
79 | } | ||
80 | } | ||
81 | } | ||
diff --git a/OpenSim/Servers/Base/ServicesServerBase.cs b/OpenSim/Servers/Base/ServicesServerBase.cs index cc9b778..2673cbe 100644 --- a/OpenSim/Servers/Base/ServicesServerBase.cs +++ b/OpenSim/Servers/Base/ServicesServerBase.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Servers.Base | |||
53 | 53 | ||
54 | // Configuration | 54 | // Configuration |
55 | // | 55 | // |
56 | IConfigSource m_Config = null; | 56 | protected IConfigSource m_Config = null; |
57 | 57 | ||
58 | // Run flag | 58 | // Run flag |
59 | // | 59 | // |