diff options
author | Justin Clarke Casey | 2008-05-13 13:36:21 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-13 13:36:21 +0000 |
commit | 550018f02dbe9d725ff9cdd69f3cf17fac727220 (patch) | |
tree | a76aa5edb00b826d2809ba118675c15319ceaddf /OpenSim/Framework/Servers | |
parent | * Implemented ChildAgentDataUpdate throttle multiplier based on an inaccurate... (diff) | |
download | opensim-SC_OLD-550018f02dbe9d725ff9cdd69f3cf17fac727220.zip opensim-SC_OLD-550018f02dbe9d725ff9cdd69f3cf17fac727220.tar.gz opensim-SC_OLD-550018f02dbe9d725ff9cdd69f3cf17fac727220.tar.bz2 opensim-SC_OLD-550018f02dbe9d725ff9cdd69f3cf17fac727220.tar.xz |
* As part of the region registration process, the grid service now requests the status of the region using the region http uri just passed in
* If the status cannot be retrieved, then the region startup will terminate.
* The aim of this is for earlier detection of situations where the region can send messages out but cannot accept incoming requests (often due to firewall issues)
* This is currently an extremely simplistic check which completely trusts whatever http uri is given by the region
* This contact may be problematic, though since the user service needs to be able to contact the region http uri, it doesn't seem unreasonable for the grid to have to be able to do so too at this stage
* This change will require a prebuild
Diffstat (limited to 'OpenSim/Framework/Servers')
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index e198c2c..2f495a9 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -144,6 +144,8 @@ namespace OpenSim.Framework.Servers | |||
144 | 144 | ||
145 | string path = request.RawUrl; | 145 | string path = request.RawUrl; |
146 | string handlerKey = GetHandlerKey(request.HttpMethod, path); | 146 | string handlerKey = GetHandlerKey(request.HttpMethod, path); |
147 | |||
148 | //m_log.DebugFormat("[BASE HTTP SERVER]: Handling {0} request for {1}", request.HttpMethod, path); | ||
147 | 149 | ||
148 | IRequestHandler requestHandler; | 150 | IRequestHandler requestHandler; |
149 | 151 | ||
@@ -154,6 +156,7 @@ namespace OpenSim.Framework.Servers | |||
154 | if (requestHandler is IStreamedRequestHandler) | 156 | if (requestHandler is IStreamedRequestHandler) |
155 | { | 157 | { |
156 | IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler; | 158 | IStreamedRequestHandler streamedRequestHandler = requestHandler as IStreamedRequestHandler; |
159 | |||
157 | buffer = streamedRequestHandler.Handle(path, request.InputStream); | 160 | buffer = streamedRequestHandler.Handle(path, request.InputStream); |
158 | } | 161 | } |
159 | else | 162 | else |
@@ -179,7 +182,7 @@ namespace OpenSim.Framework.Servers | |||
179 | } | 182 | } |
180 | catch (HttpListenerException) | 183 | catch (HttpListenerException) |
181 | { | 184 | { |
182 | m_log.InfoFormat("[BASE HTTP SERVER] Http request abnormally terminated."); | 185 | m_log.WarnFormat("[BASE HTTP SERVER]: HTTP request abnormally terminated."); |
183 | } | 186 | } |
184 | } | 187 | } |
185 | else | 188 | else |