ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-15 02:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,640 Commits 5 Branches 96 Tags
c5d2151674f083f1021984c9cb97f1b2dfdb81cf
Commit Graph

166 Commits

Author SHA1 Message Date
UbitUmarov
02cb0bf80a added a timeout paramenter to PollServiceEventArgs, so each type can define it's timeout 2012-07-04 17:40:02 +01:00
UbitUmarov
e533eef962 *test2* http poll: increased again the pool rate do 10/s but increased timeout to 1s. So data there is less delay when there is new data, but enought waiting time for it to be avaiable 2012-07-04 15:07:10 +01:00
UbitUmarov
b2fa20001f *test* slow http retries pool rate to original 1s 2012-07-04 06:14:47 +01:00
UbitUmarov
d3f1fc79e5 *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming. 2012-07-01 01:33:20 +01:00
Melanie
9a8de52940 Add an event to the poll service manager thread to allow starting it 
when needed rather than once per second. That is just too slow!
 2012-06-26 10:49:37 +02:00
Melanie
b39de2425c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-07 04:52:14 +01:00
Diva Canto
cdbe34716f Thank you, BaseHttpServer, for telling me where things go wrong. 2012-04-06 11:21:27 -07:00
Melanie
37068d17c5 Merge branch 'master' into careminster 2012-02-24 09:56:06 +00:00
Justin Clark-Casey (justincc)
f67f37074f Stop spurious scene loop startup timeout alarms for scenes with many prims. 
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
 2012-02-24 05:02:33 +00:00
Melanie
50aa89dae6 Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2011-12-08 03:24:25 +00:00
Justin Clark-Casey (justincc)
e6272b8d56 Stop also adding an ordinary http handler when we set up a poll http handler. 
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
 2011-12-07 12:28:42 +00:00
Justin Clark-Casey (justincc)
4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse. 
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
 2011-12-05 20:44:20 +00:00
Melanie
bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Melanie
b60ff651a3 Merge branch 'master' into bigmerge 2011-12-01 12:16:59 +00:00
Justin Clark-Casey (justincc)
fa63054c4f On "show caps", stop excluding the seed cap but do exclude it elsewhere 2011-11-29 20:37:03 +00:00
Justin Clark-Casey (justincc)
679a5f6c0b With "debug http 1", show the path with the query string instead of just the path. 
Also simplifies debug levels to just 0 and 1
 2011-11-29 17:26:45 +00:00
Justin Clark-Casey (justincc)
b6b0bc7b32 Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator 2011-11-29 16:15:52 +00:00
Melanie
31736b1aac Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
 2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
ccae787d03 send a watchdog heartbeat for a poll worker thread when it's actually run 2011-11-15 22:20:44 +00:00
Melanie
a1426739a2 Merge branch 'master' into bigmerge 2011-11-10 17:35:35 +00:00
Justin Clark-Casey (justincc)
7e488cd635 Remove unused avariable in PollServiceRequestManager 2011-11-07 23:24:13 +00:00
Melanie
fd22159d0c Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Framework/Watchdog.cs
 2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc)
c275c22928 Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c. 
Also adds these to the watchdogs with very large timeouts (should really be infinite)
 2011-10-25 23:26:21 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around. 
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this.  This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
 2011-10-25 20:24:21 +01:00
Melanie
27aca49a1f Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge 2011-10-25 03:26:51 +01:00
Melanie
c8dfef1583 Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge 2011-10-25 03:26:44 +01:00
Justin Clark-Casey (justincc)
e14cb45b9b Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() 
Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
 2011-10-24 23:26:41 +01:00
Justin Clark-Casey (justincc)
9ec672c70b Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler 
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
 2011-10-24 23:16:03 +01:00
Melanie
d1e681f682 Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2011-10-11 23:14:23 +01:00
Justin Clark-Casey (justincc)
e742cffe15 Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off. 
This is for debugging purposes.  Defaults to Attachments Enabled
 2011-09-30 01:19:22 +01:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
d74686fd51 read m_rpcHandlersKeepAlive under appropriate lock 2011-08-22 02:25:58 +01:00
Justin Clark-Casey (justincc)
c587b0a3a3 oops, fix build break from last commit 2011-08-22 02:10:45 +01:00
Justin Clark-Casey (justincc)
9469c62098 improve locking of m_agentHandlers in BaseHttpServer 2011-08-22 02:07:51 +01:00
Justin Clark-Casey (justincc)
f9a367e2f6 improve locking of m_HTTPHandlers in BaseHttpServer 2011-08-22 01:59:40 +01:00
Justin Clark-Casey (justincc)
5a11cffd23 improve locking of m_streamHandlers in BaseHttpServer 2011-08-22 01:58:50 +01:00
Justin Clark-Casey (justincc)
20a4367827 remove necessity to catch a KeyNotFoundException in BaseHttpServer.RemoveLLSDHandler() 2011-08-22 01:58:19 +01:00
Justin Clark-Casey (justincc)
8254116dc6 improve locking of m_llsdHandlers in BaseHttpServer 2011-08-22 01:52:08 +01:00
Justin Clark-Casey (justincc)
2f1ac1d144 minor: remove mono compiler warning 2011-08-22 01:45:46 +01:00
Justin Clark-Casey (justincc)
94a8ab80c8 improve locking of m_rpcHandlers in BaseHttpServer 2011-08-22 01:43:34 +01:00
Melanie
9b1d3f0c38 Merge branch 'master' into careminster-presence-refactor 2011-06-13 12:38:17 +01:00
Diva Canto
fd57c91b4a First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD. 2011-06-12 15:37:42 -07:00
Tom
b000d9ba72 Some additional protection, it seems that responsedata needs to be locked, but I can't immediately see where it's being accessed from another thread. For now, this will protect the server 2011-05-26 03:42:01 -07:00
Tom
74dd619575 If a response cannot be obtained (the script has no handler) return a more friendly 500 error instead of crashing out with a null reference and letting the connection hang 2011-05-17 19:12:37 -07:00
BlueWall
8ca7938753 Adding ssl support 
Adding ssl support for "Out of Band" applications such as the remote
	admin module or Robust services
 2011-05-05 19:56:54 -04:00
Justin Clark-Casey (justincc)
ccc26f7443 Get Viewer 2 voice working with OpenSim. 
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php.  This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php.  This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
 2011-04-20 01:02:40 +01:00
Diva Canto
7592a033df Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd. 2011-04-12 20:24:28 -07:00
BlueWall
a3651eb5d0 Thanks Kevin Cozens for a patch that: 
Fixes several spelling mistakes
 2011-03-17 05:48:42 -04:00
Justin Clark-Casey (justincc)
aadd0e8d42 minor: bring comment into line with code reality 2011-03-16 00:14:58 +00:00
Melanie
cee5e3e264 Up the timeout on slow requests to 3000 to stop console spam. Make sure 
request method and target are reported correctly and drop the txn id
as it's empty 99% of the time.
 2011-03-14 14:51:13 +00:00