From db9d3d3a90939b8b5d803271ca9e8040f49ea64e Mon Sep 17 00:00:00 2001
From: diva <diva@metaverseink.com>
Date: Sat, 6 Jun 2009 17:06:47 +0000
Subject: [PATCH] Added Flotsam's cache config vars to configuration. Made it
 the default in grided sims. Made Cenome cache the default in standalone sims.
 More splitting in ini files, invisible to the user.

---
 bin/config-include/Grid.ini                   |  1 +
 bin/config-include/GridCommon.ini.example     | 37 +++++++++++++------
 bin/config-include/GridHypergrid.ini          |  1 +
 bin/config-include/StableSettings.ini         | 28 ++++++++++++++
 bin/config-include/Standalone.ini             |  1 +
 .../StandaloneCommon.ini.example              | 17 +--------
 bin/config-include/StandaloneHypergrid.ini    |  1 +
 7 files changed, 60 insertions(+), 26 deletions(-)
 create mode 100644 bin/config-include/StableSettings.ini

diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 6a339f2039..4f2e839010 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "RemoteAssetServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index fb51c1f5d0..3eeec9547d 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,20 +1,35 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
-    AssetCaching = "GlynnTuckerAssetCache"
+    ;AssetCaching = "GlynnTuckerAssetCache"
     ;AssetCaching = "CenomeMemoryAssetCache"
+    AssetCaching = "FlotsamAssetCache"
 
 [AssetCache]
-    ;; Optional configurations for CoreAssetCache
-    ; Number of buckets for assets
-    ;CacheBuckets = 32768
+    ;; ---- Optional configurations for FlotsamAssetCache
+    ;
+    ; The cache directory can be shared by multiple instances,
+    ; so you may want to change this! Note that you can 
+    ; specify an absolute path (starting with '/'). 
+    ; See examples in comments.
+    ; Make sure the directory you specify can be created.
+    ;
+    CacheDirectory = ./assetcache
+    ;
+    ; Some other examples:
+    ; CacheDirectory = /var/opensim/assetcache ; (Windows and linux)
+    ; CacheDirectory = ~/assetcache ; (Windows and linux)
+    ; CacheDirectory = C:\opensim\assetcache ; (Windows only)
+    
+    ;
+    ; How long {in hours} to keep assets cached on disk, 
+    ; .5 == 30 minutes; 168 = 7 days
+    ; Specify 0 if you do not want your disk cache to expire
+    ;
+    FileCacheTimeout = 168 
+    
+
+    ;; --------- endof FlotsamAssetCache --------
 
-    ;; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
 
 [AssetService]
 
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index e21f3065e7..f22113b603 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "HGAssetBroker"
diff --git a/bin/config-include/StableSettings.ini b/bin/config-include/StableSettings.ini
new file mode 100644
index 0000000000..5e3cbbc934
--- /dev/null
+++ b/bin/config-include/StableSettings.ini
@@ -0,0 +1,28 @@
+[AssetCache]
+    ;; ---- Optional configurations for CoreAssetCache
+    ; Number of buckets for assets
+    ;CacheBuckets = 32768
+    ;; ---- endof CoreAssetCache ----------------
+
+    ;; ---- Optional configurations for CenomeMemoryAssetCache
+    ; Cache size 128 MB (default: 134217728)
+    ; MaxSize = 134217728
+    ; Maximal asset count 
+    ; MaxCount = 4096
+    ; Asset's expiration time (minutes)
+    ; ExpirationTime = 30
+    ;; ---- endof CenomeMemoryAssetCache --------
+
+    ;; ---- Optional configurations for FlotsamAssetCache
+
+    ; Set to false for disk cache only.
+    MemoryCacheEnabled = true
+
+    ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
+    MemoryCacheTimeout = 2
+
+    ; How often {in hours} should the disk be checked for expired filed
+    ; Specify 0 to disable expiration checking
+    FileCleanupTimer = .166  ;roughly every 10 minutes
+
+    ;; ---- endof FlotsamAssetCache --------
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index dd9fdb5ca9..74c440eee0 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "LocalAssetServicesConnector"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d03c003e99..034d1e234f 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,20 +1,7 @@
 [Modules]
     ;AssetCaching = "CoreAssetCache"
-    AssetCaching = "GlynnTuckerAssetCache"
-    ;AssetCaching = "CenomeMemoryAssetCache"
-
-[AssetCache]
-    ;; Optional configurations for CoreAssetCache
-    ; Number of buckets for assets
-    ;CacheBuckets = 16384
-
-    ;; Optional configurations for CenomeMemoryAssetCache
-    ; Cache size 128 MB (default: 134217728)
-    ; MaxSize = 134217728
-    ; Maximal asset count 
-    ; MaxCount = 4096
-    ; Asset's expiration time (minutes)
-    ; ExpirationTime = 30
+    ;AssetCaching = "GlynnTuckerAssetCache"
+    AssetCaching = "CenomeMemoryAssetCache"
     
 [AssetService]
     ;
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a97ac7b6c6..7c5700e5f6 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,5 +1,6 @@
 [Includes]
     Include-Common = "config-include/StandaloneCommon.ini"
+    Include-Stable = "config-include/StableSettings.ini"
 
 [Modules]
     AssetServices = "HGAssetBroker"