aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-09-243-131/+228
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Make BaseHttpServer throws say something useful.Diva Canto2012-09-221-2/+2
| |
| * Comment out the long unused afaik HTTP agent handlers.Justin Clark-Casey (justincc)2012-09-213-87/+87
| | | | | | | | | | | | As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead. So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway. If this facility is actually being used then please notify me or uncomment it if you are core.
| * Add request number counting to incoming HTTP requests in the same way that ↵Justin Clark-Casey (justincc)2012-09-211-18/+41
| | | | | | | | | | | | | | | | | | this was already being done for outgoing HTTP requests. This allows us to associate debug logging messages with the right request. It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some. This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled. This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports.
| * Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the ↵Justin Clark-Casey (justincc)2012-09-202-32/+63
| | | | | | | | | | | | | | request took. This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed. This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively.
| * Add ability to turn on/off logging of outgoing HTTP requests flowing through ↵Justin Clark-Casey (justincc)2012-09-202-27/+70
| | | | | | | | | | | | | | | | | | WebUtil. This is for debugging purposes. This is controlled via the "debug http" command which can already log incoming requests. This now gains a mandatory parameter of in, out or all to control what is logged. Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages.
* | Merge branch 'avination' into careminsterMelanie2012-09-163-18/+37
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
| * | Revamp the HTTP textures handler to allow a maximum of four fetchesMelanie2012-09-143-17/+36
| | | | | | | | | | | | at any time and to drop requests for avatars n longer in the scene
| * | Allow setting max connections for an endpointMelanie2012-09-141-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-162-13/+110
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * | Fix usage statement on "debug http" console command since max level is now 5 ↵Justin Clark-Casey (justincc)2012-09-121-1/+1
| | | | | | | | | | | | rather than 3
| * | Fix bug in logging sample input at debug http level 4.Justin Clark-Casey (justincc)2012-09-121-1/+1
| | | | | | | | | | | | Also converts newlines to "\n" text.
| * | Make "show http-handlers" command available for ROBUST instances as well as ↵Justin Clark-Casey (justincc)2012-09-121-0/+51
| | | | | | | | | | | | the simulator executable.
| * | Add levels 4 and 5 to "debug http" console command that will log a sample of ↵Justin Clark-Casey (justincc)2012-09-112-12/+58
| | | | | | | | | | | | | | | | | | incoming request data and the entire incoming data respectively. See "help debug http" for more details.
* | | Merge branch 'avination' into careminsterMelanie2012-09-101-1/+2
|\ \ \ | | |/ | |/|
| * | add a extra httppool thread to compensate for webfetchinventoryUbitUmarov2012-09-101-1/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-09-071-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * Bump master code up to 0.7.5 now that 0.7.4 is out.Justin Clark-Casey (justincc)2012-09-041-1/+1
| |
* | Fix background inventory loading (Viewer 3) so it won't lag out the simMelanie2012-08-242-2/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-07-284-1/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * Remove a couple of compiler warnings pointed out by SignpostMarvJustin Clark-Casey (justincc)2012-07-271-1/+0
| |
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-254-0/+4
| | | | | | | | with other monitoring code from OpenSim.Framework
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-1/+1
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
* | Merge branch 'ubitwork' into avinationMelanie2012-07-171-10/+47
|\ \
| * | fix PollServiceRequestManagerUbitUmarov2012-07-171-10/+47
| | |
* | | Replace PollServiceRequestManager with older version, add extra logging toMelanie2012-07-171-7/+6
|/ / | | | | | | event exceptions to see call path leading up to it.
* | Merge branch 'avination' into careminsterMelanie2012-07-161-1/+3
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
| | | | | | | | | | | | CN
* | | Merge branch 'master' into careminsterMelanie2012-07-121-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than ↵Justin Clark-Casey (justincc)2012-07-111-2/+2
| | | | | | | | | | | | | | | | | | | | | constructing fresh copies. The encodings are thread-safe and already used in such a manner in other places. This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
* | | Merge branch 'avination' into careminsterMelanie2012-07-063-2/+251
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Convert the slow request queue into a regular queue and add some cleanupMelanie2012-07-061-4/+18
| | | | | | | | | | | | and locking.
| * | Fix the boo-booMelanie2012-07-051-3/+3
| | |
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-052-11/+34
| | | | | | | | | | | | | | | the manager to tell what type of event it is. All events except for lsl http in go to the "slow queue" which is run once per second as before.
| * | use the pollEvent timeout paramenter on poolingUbitUmarov2012-07-041-4/+7
| | |
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵UbitUmarov2012-07-041-1/+4
| | | | | | | | | | | | it's timeout
| * | *test2* http poll: increased again the pool rate do 10/s but increased ↵UbitUmarov2012-07-041-2/+2
| | | | | | | | | | | | timeout to 1s. So data there is less delay when there is new data, but enought waiting time for it to be avaiable
| * | *test* slow http retries pool rate to original 1sUbitUmarov2012-07-041-1/+1
| | |
| * | *TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued ↵UbitUmarov2012-07-012-0/+206
| | | | | | | | | | | | to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming.
* | | Merge branch 'avination' into careminsterMelanie2012-06-292-5/+15
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
| * | Add an event to the poll service manager thread to allow starting itMelanie2012-06-262-4/+14
| | | | | | | | | | | | when needed rather than once per second. That is just too slow!
* | | Merge branch 'master' into careminsterMelanie2012-06-263-6/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Avoid a race condition where an incoming request to a script external URL ↵Justin Clark-Casey (justincc)2012-06-222-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can trigger an exception is the URL was being removed at the same time. This involves three steps 1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index 2) Return true instead of false in HasEvents() if no matching request is found in the map. This call will only happen in the first place for raced requests. 3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK. Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
| * | If starting scripts on initial sim start, provide INFO level log feedback ↵Justin Clark-Casey (justincc)2012-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | each time 50 scripts have been started. This is to provide an indication of what's happening now that the default isn't to report every single script start. Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
* | | Merge branch 'master' into careminsterMelanie2012-06-212-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Remove STARTUP COMPLETE message from the startuplogo.txt file and into main ↵Justin Clark-Casey (justincc)2012-06-201-1/+3
| | | | | | | | | | | | logging
| * | Comment out the neighbour and land in connectors from info logging that they ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | | | | | are starting up
| * | Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses ↵Justin Clark-Casey (justincc)2012-06-161-3/+1
| | | | | | | | | | | | would always return OK even if some other status code had been set
* | | Merge branch 'master' into careminsterMelanie2012-06-151-1/+1
|\ \ \ | |/ /
| * | Put all debug console commands into a single Debug section rather than ↵Justin Clark-Casey (justincc)2012-06-151-1/+1
| | | | | | | | | | | | scattering them over other categories
generated by cgit v1.1 at 2024-12-20 10:10:58 +0000