diff options
| author | UbitUmarov | 2017-05-23 07:35:02 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-23 07:35:02 +0100 |
| commit | c0bfaac0ac6873720b7c3721436ca54e93d5072c (patch) | |
| tree | 62f6b02569ba6dd968d76ad9bf2aa6ccf839d588 /OpenSim/Region/Application | |
| parent | reenqueue poll events while conn is open, and not expired (diff) | |
| parent | dont log timeouts on stopped threads (diff) | |
| download | opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.zip opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.gz opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.bz2 opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.xz | |
merge master
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/Application.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index bc6d7b3..4bd2c28 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
| @@ -77,7 +77,11 @@ namespace OpenSim | |||
| 77 | if(Util.IsWindows()) | 77 | if(Util.IsWindows()) |
| 78 | ServicePointManager.DefaultConnectionLimit = 32; | 78 | ServicePointManager.DefaultConnectionLimit = 32; |
| 79 | else | 79 | else |
| 80 | { | ||
| 80 | ServicePointManager.DefaultConnectionLimit = 12; | 81 | ServicePointManager.DefaultConnectionLimit = 12; |
| 82 | try { ServicePointManager.DnsRefreshTimeout = 120000; } // just is case crazy some mono decides to have it infinity | ||
| 83 | catch { } | ||
| 84 | } | ||
| 81 | 85 | ||
| 82 | ServicePointManager.Expect100Continue = false; | 86 | ServicePointManager.Expect100Continue = false; |
| 83 | ServicePointManager.UseNagleAlgorithm = false; | 87 | ServicePointManager.UseNagleAlgorithm = false; |
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index f9f103a..524f2be 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
| @@ -504,7 +504,8 @@ namespace OpenSim | |||
| 504 | private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi) | 504 | private void WatchdogTimeoutHandler(Watchdog.ThreadWatchdogInfo twi) |
| 505 | { | 505 | { |
| 506 | int now = Environment.TickCount & Int32.MaxValue; | 506 | int now = Environment.TickCount & Int32.MaxValue; |
| 507 | 507 | if(twi.Thread.ThreadState == System.Threading.ThreadState.Stopped) | |
| 508 | return; | ||
| 508 | m_log.ErrorFormat( | 509 | m_log.ErrorFormat( |
| 509 | "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago. {3}", | 510 | "[WATCHDOG]: Timeout detected for thread \"{0}\". ThreadState={1}. Last tick was {2}ms ago. {3}", |
| 510 | twi.Thread.Name, | 511 | twi.Thread.Name, |