aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Servers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-121-28/+4
|\ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Extend "show stats" command to "show stats [list|all|<category name>]"Justin Clark-Casey (justincc)2012-10-111-28/+4
| | | | | | | | | | | | This allows different categories of stats to be shown, with options to list categories or show all stats. Currently categories are scene and simulator and only a very few stats are currently registered via this mechanism. This commit also adds percentage stats for packets and blocks reused from the packet pool.
| * Allow setting max connections for an endpointMelanie2012-09-301-1/+1
| |
| * Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-303-4/+0
| | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
| * Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-303-0/+4
| | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* | Merge branch 'avination' into careminsterMelanie2012-09-291-0/+4
|\ \
| * | Update the Http server with a few additional properties. Adapt the testMelanie2012-09-271-0/+4
| | | | | | | | | | | | server code to match.
* | | Merge branch 'master' into careminsterMelanie2012-09-292-5/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Fix bug where debug http level 6 could not be specified. Also converts ↵Justin Clark-Casey (justincc)2012-09-292-5/+5
| | | | | | | | | | | | newlines at this level to '\n' to enable them to be logged.
* | | Merge branch 'avination' into careminsterMelanie2012-09-273-38/+38
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | create a new PollServiceHttpRequest req per loop since they can be sent toUbitUmarov2012-09-271-5/+1
| | | | | | | | | | | | another working thread
| * | just remove the damm thingUbitUmarov2012-09-263-25/+3
| | |
| * | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-262-3/+10
| | | | | | | | | | | | control flag to false
| * | keep watchdog happy using it to kill his threadsUbitUmarov2012-09-261-9/+1
| | |
| * | more changes to PollServiceUbitUmarov2012-09-262-24/+18
| | |
| * | Change the poll service to use a thread pool for replies to make sure theMelanie2012-09-231-7/+38
| | | | | | | | | | | | event queues aren't blocked by other traffic.
| * | Catch a nullref in the code to suppress GetTexture warnign spam we can'tMelanie2012-09-161-1/+1
| | | | | | | | | | | | do a thing about anyway.
| * | Sequence/throttle asset retrievals.Melanie2012-09-141-0/+2
| | |
* | | 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.
generated by cgit v1.1 at 2024-12-14 06:29:06 +0000