diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-27 19:36:52 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-27 19:36:52 -0400 |
commit | 65dda8a795b658a39c2f617124a31c928030fb4b (patch) | |
tree | a95c5e5d82fecd321c76abb6dd26737a3fff4629 /OpenSim | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
parent | Remove OpenSim.ini comments from the top of FlotsamAssetCache.cs to avoid dup... (diff) | |
download | opensim-SC-65dda8a795b658a39c2f617124a31c928030fb4b.zip opensim-SC-65dda8a795b658a39c2f617124a31c928030fb4b.tar.gz opensim-SC-65dda8a795b658a39c2f617124a31c928030fb4b.tar.bz2 opensim-SC-65dda8a795b658a39c2f617124a31c928030fb4b.tar.xz |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim')
6 files changed, 52 insertions, 58 deletions
diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs index 933fa12..2bb0926 100644 --- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs | |||
@@ -330,5 +330,16 @@ namespace OpenSim.Framework.Communications.Tests | |||
330 | Assert.That(rootFolder.RequestListOfFolders(), Is.Empty); | 330 | Assert.That(rootFolder.RequestListOfFolders(), Is.Empty); |
331 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null); | 331 | Assert.That(myScene.InventoryService.GetFolder(myFolder), Is.Null); |
332 | } | 332 | } |
333 | |||
334 | [TearDown] | ||
335 | public void TearDown() | ||
336 | { | ||
337 | try | ||
338 | { | ||
339 | if (MainServer.Instance != null) MainServer.Instance.Stop(); | ||
340 | } | ||
341 | catch (System.NullReferenceException) | ||
342 | { } | ||
343 | } | ||
333 | } | 344 | } |
334 | } \ No newline at end of file | 345 | } \ No newline at end of file |
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs index 57a908e..0a9d2ae 100644 --- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs +++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs | |||
@@ -362,6 +362,16 @@ namespace OpenSim.Framework.Communications.Tests | |||
362 | //Console.WriteLine("Finished T023_TestAuthenticatedLoginAlreadyLoggedIn()"); | 362 | //Console.WriteLine("Finished T023_TestAuthenticatedLoginAlreadyLoggedIn()"); |
363 | } | 363 | } |
364 | 364 | ||
365 | [TearDown] | ||
366 | public void TearDown() | ||
367 | { | ||
368 | try | ||
369 | { | ||
370 | if (MainServer.Instance != null) MainServer.Instance.Stop(); | ||
371 | } catch (NullReferenceException) | ||
372 | {} | ||
373 | } | ||
374 | |||
365 | public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector | 375 | public class TestLoginToRegionConnector : ILoginServiceToRegionsConnector |
366 | { | 376 | { |
367 | private List<RegionInfo> m_regionsList = new List<RegionInfo>(); | 377 | private List<RegionInfo> m_regionsList = new List<RegionInfo>(); |
diff --git a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs index 75c9310..771ae05 100644 --- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs | |||
@@ -1637,13 +1637,20 @@ namespace OpenSim.Framework.Servers.HttpServer | |||
1637 | public void Stop() | 1637 | public void Stop() |
1638 | { | 1638 | { |
1639 | HTTPDRunning = false; | 1639 | HTTPDRunning = false; |
1640 | m_httpListener2.ExceptionThrown -= httpServerException; | 1640 | try |
1641 | //m_httpListener2.DisconnectHandler = null; | 1641 | { |
1642 | 1642 | m_httpListener2.ExceptionThrown -= httpServerException; | |
1643 | m_httpListener2.LogWriter = null; | 1643 | //m_httpListener2.DisconnectHandler = null; |
1644 | m_httpListener2.RequestReceived -= OnRequest; | ||
1645 | 1644 | ||
1646 | m_httpListener2.Stop(); | 1645 | m_httpListener2.LogWriter = null; |
1646 | m_httpListener2.RequestReceived -= OnRequest; | ||
1647 | m_httpListener2.Stop(); | ||
1648 | } | ||
1649 | catch (NullReferenceException) | ||
1650 | { | ||
1651 | m_log.Warn("[BASEHTTPSERVER]: Null Reference when stopping HttpServer."); | ||
1652 | } | ||
1653 | |||
1647 | } | 1654 | } |
1648 | 1655 | ||
1649 | public void RemoveStreamHandler(string httpMethod, string path) | 1656 | public void RemoveStreamHandler(string httpMethod, string path) |
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index c7723f1..c91b63e 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
@@ -53,57 +53,6 @@ using OpenSim.Services.Interfaces; | |||
53 | 53 | ||
54 | namespace Flotsam.RegionModules.AssetCache | 54 | namespace Flotsam.RegionModules.AssetCache |
55 | { | 55 | { |
56 | /// <summary> | ||
57 | /// OpenSim.ini Options: | ||
58 | /// ------- | ||
59 | /// [Modules] | ||
60 | /// AssetCaching = "FlotsamAssetCache" | ||
61 | /// | ||
62 | /// [AssetCache] | ||
63 | /// ; cache directory can be shared by multiple instances | ||
64 | /// CacheDirectory = /directory/writable/by/OpenSim/instance | ||
65 | /// | ||
66 | /// ; Log level | ||
67 | /// ; 0 - (Error) Errors only | ||
68 | /// ; 1 - (Info) Hit Rate Stats + Level 0 | ||
69 | /// ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1 | ||
70 | /// ; | ||
71 | /// LogLevel = 1 | ||
72 | /// | ||
73 | /// ; How often should hit rates be displayed (given in AssetRequests) | ||
74 | /// ; 0 to disable | ||
75 | /// HitRateDisplay = 100 | ||
76 | /// | ||
77 | /// ; Set to false for disk cache only. | ||
78 | /// MemoryCacheEnabled = true | ||
79 | /// | ||
80 | /// ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes | ||
81 | /// MemoryCacheTimeout = 2 | ||
82 | /// | ||
83 | /// ; How long {in hours} to keep assets cached on disk, .5 == 30 minutes | ||
84 | /// ; Specify 0 if you do not want your disk cache to expire | ||
85 | /// FileCacheTimeout = 0 | ||
86 | /// | ||
87 | /// ; How often {in hours} should the disk be checked for expired filed | ||
88 | /// ; Specify 0 to disable expiration checking | ||
89 | /// FileCleanupTimer = .166 ;roughly every 10 minutes | ||
90 | /// | ||
91 | /// ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how | ||
92 | /// ; long (in miliseconds) to block a request thread while trying to complete | ||
93 | /// ; writing to disk. | ||
94 | /// WaitOnInprogressTimeout = 3000 | ||
95 | /// | ||
96 | /// ; Number of tiers to use for cache directories (current valid range 1 to 3) | ||
97 | /// CacheDirectoryTiers = 1 | ||
98 | /// | ||
99 | /// ; Number of letters per path tier, 1 will create 16 directories per tier, 2 - 256, 3 - 4096 and 4 - 65K | ||
100 | /// CacheDirectoryTierLength = 3 | ||
101 | /// | ||
102 | /// ; Warning level for cache directory size | ||
103 | /// CacheWarnAt = 30000 | ||
104 | /// ------- | ||
105 | /// </summary> | ||
106 | |||
107 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 56 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
108 | public class FlotsamAssetCache : ISharedRegionModule, IImprovedAssetCache | 57 | public class FlotsamAssetCache : ISharedRegionModule, IImprovedAssetCache |
109 | { | 58 | { |
@@ -361,7 +310,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
361 | { | 310 | { |
362 | try | 311 | try |
363 | { | 312 | { |
364 | FileStream stream = File.Open(filename, FileMode.Open); | 313 | FileStream stream = File.Open(filename, FileMode.Open, FileAccess.Read, FileShare.Read); |
365 | BinaryFormatter bformatter = new BinaryFormatter(); | 314 | BinaryFormatter bformatter = new BinaryFormatter(); |
366 | 315 | ||
367 | asset = (AssetBase)bformatter.Deserialize(stream); | 316 | asset = (AssetBase)bformatter.Deserialize(stream); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index 3ee6007..8cd1d55 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -378,6 +378,12 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
378 | Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects"); | 378 | Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects"); |
379 | } | 379 | } |
380 | 380 | ||
381 | [TearDown] | ||
382 | public void TearDown() | ||
383 | { | ||
384 | if (MainServer.Instance != null) MainServer.Instance.Stop(); | ||
385 | } | ||
386 | |||
381 | public static string GetRandomCapsObjectPath() | 387 | public static string GetRandomCapsObjectPath() |
382 | { | 388 | { |
383 | TestHelper.InMethod(); | 389 | TestHelper.InMethod(); |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs index 23eab90..1d460dd 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs | |||
@@ -78,6 +78,17 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
78 | // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); | 78 | // Console.WriteLine("Beginning test {0}", MethodBase.GetCurrentMethod()); |
79 | } | 79 | } |
80 | 80 | ||
81 | [TearDown] | ||
82 | public void TearDown() | ||
83 | { | ||
84 | try | ||
85 | { | ||
86 | if (MainServer.Instance != null) MainServer.Instance.Stop(); | ||
87 | } | ||
88 | catch (NullReferenceException) | ||
89 | { } | ||
90 | } | ||
91 | |||
81 | } | 92 | } |
82 | 93 | ||
83 | public class ThreadRunResults | 94 | public class ThreadRunResults |