diff options
| author | Justin Clark-Casey (justincc) | 2011-02-25 01:31:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-02-25 01:31:38 +0000 |
| commit | 0f545abfc17392c4a2113b07a945bd4cc7b8366f (patch) | |
| tree | 5aa207ced70da7b33f08e0eb7572a6b28e5e5a88 /OpenSim/Region | |
| parent | instead of using different default memory expiration depending on whether the... (diff) | |
| download | opensim-SC-0f545abfc17392c4a2113b07a945bd4cc7b8366f.zip opensim-SC-0f545abfc17392c4a2113b07a945bd4cc7b8366f.tar.gz opensim-SC-0f545abfc17392c4a2113b07a945bd4cc7b8366f.tar.bz2 opensim-SC-0f545abfc17392c4a2113b07a945bd4cc7b8366f.tar.xz | |
Make the file expiration defaults the same whether the whole [FLOTSAM ASSET CACHE] section is missing or just the particular config values
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 02a4e4d..9adb68b 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||
| @@ -93,8 +93,8 @@ namespace Flotsam.RegionModules.AssetCache | |||
| 93 | private const double m_DefaultMemoryExpiration = 1.0; | 93 | private const double m_DefaultMemoryExpiration = 1.0; |
| 94 | private const double m_DefaultFileExpiration = 48; | 94 | private const double m_DefaultFileExpiration = 48; |
| 95 | private TimeSpan m_MemoryExpiration = TimeSpan.FromHours(m_DefaultMemoryExpiration); | 95 | private TimeSpan m_MemoryExpiration = TimeSpan.FromHours(m_DefaultMemoryExpiration); |
| 96 | private TimeSpan m_FileExpiration = TimeSpan.Zero; | 96 | private TimeSpan m_FileExpiration = TimeSpan.FromHours(m_DefaultFileExpiration); |
| 97 | private TimeSpan m_FileExpirationCleanupTimer = TimeSpan.Zero; | 97 | private TimeSpan m_FileExpirationCleanupTimer = TimeSpan.FromHours(m_DefaultFileExpiration); |
| 98 | 98 | ||
| 99 | private static int m_CacheDirectoryTiers = 1; | 99 | private static int m_CacheDirectoryTiers = 1; |
| 100 | private static int m_CacheDirectoryTierLen = 3; | 100 | private static int m_CacheDirectoryTierLen = 3; |
| @@ -441,7 +441,7 @@ namespace Flotsam.RegionModules.AssetCache | |||
| 441 | private void CleanupExpiredFiles(object source, ElapsedEventArgs e) | 441 | private void CleanupExpiredFiles(object source, ElapsedEventArgs e) |
| 442 | { | 442 | { |
| 443 | if (m_LogLevel >= 2) | 443 | if (m_LogLevel >= 2) |
| 444 | m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Checking for expired files older then {0}.", m_FileExpiration.ToString()); | 444 | m_log.DebugFormat("[FLOTSAM ASSET CACHE]: Checking for expired files older then {0}.", m_FileExpiration); |
| 445 | 445 | ||
| 446 | // Purge all files last accessed prior to this point | 446 | // Purge all files last accessed prior to this point |
| 447 | DateTime purgeLine = DateTime.Now - m_FileExpiration; | 447 | DateTime purgeLine = DateTime.Now - m_FileExpiration; |