aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authordiva2009-06-06 17:06:47 +0000
committerdiva2009-06-06 17:06:47 +0000
commitdb9d3d3a90939b8b5d803271ca9e8040f49ea64e (patch)
tree29612d72d7de83d0ea3933df8527abd1d486d26c
parentCorrect an error where the config file name was always considered to be a (diff)
downloadopensim-SC_OLD-db9d3d3a90939b8b5d803271ca9e8040f49ea64e.zip
opensim-SC_OLD-db9d3d3a90939b8b5d803271ca9e8040f49ea64e.tar.gz
opensim-SC_OLD-db9d3d3a90939b8b5d803271ca9e8040f49ea64e.tar.bz2
opensim-SC_OLD-db9d3d3a90939b8b5d803271ca9e8040f49ea64e.tar.xz
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.
-rw-r--r--bin/config-include/Grid.ini1
-rw-r--r--bin/config-include/GridCommon.ini.example37
-rw-r--r--bin/config-include/GridHypergrid.ini1
-rw-r--r--bin/config-include/StableSettings.ini28
-rw-r--r--bin/config-include/Standalone.ini1
-rw-r--r--bin/config-include/StandaloneCommon.ini.example17
-rw-r--r--bin/config-include/StandaloneHypergrid.ini1
7 files changed, 60 insertions, 26 deletions
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index 6a339f2..4f2e839 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -1,5 +1,6 @@
1[Includes] 1[Includes]
2 Include-Common = "config-include/GridCommon.ini" 2 Include-Common = "config-include/GridCommon.ini"
3 Include-Stable = "config-include/StableSettings.ini"
3 4
4[Modules] 5[Modules]
5 AssetServices = "RemoteAssetServicesConnector" 6 AssetServices = "RemoteAssetServicesConnector"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index fb51c1f..3eeec95 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -1,20 +1,35 @@
1[Modules] 1[Modules]
2 ;AssetCaching = "CoreAssetCache" 2 ;AssetCaching = "CoreAssetCache"
3 AssetCaching = "GlynnTuckerAssetCache" 3 ;AssetCaching = "GlynnTuckerAssetCache"
4 ;AssetCaching = "CenomeMemoryAssetCache" 4 ;AssetCaching = "CenomeMemoryAssetCache"
5 AssetCaching = "FlotsamAssetCache"
5 6
6[AssetCache] 7[AssetCache]
7 ;; Optional configurations for CoreAssetCache 8 ;; ---- Optional configurations for FlotsamAssetCache
8 ; Number of buckets for assets 9 ;
9 ;CacheBuckets = 32768 10 ; The cache directory can be shared by multiple instances,
11 ; so you may want to change this! Note that you can
12 ; specify an absolute path (starting with '/').
13 ; See examples in comments.
14 ; Make sure the directory you specify can be created.
15 ;
16 CacheDirectory = ./assetcache
17 ;
18 ; Some other examples:
19 ; CacheDirectory = /var/opensim/assetcache ; (Windows and linux)
20 ; CacheDirectory = ~/assetcache ; (Windows and linux)
21 ; CacheDirectory = C:\opensim\assetcache ; (Windows only)
22
23 ;
24 ; How long {in hours} to keep assets cached on disk,
25 ; .5 == 30 minutes; 168 = 7 days
26 ; Specify 0 if you do not want your disk cache to expire
27 ;
28 FileCacheTimeout = 168
29
30
31 ;; --------- endof FlotsamAssetCache --------
10 32
11 ;; Optional configurations for CenomeMemoryAssetCache
12 ; Cache size 128 MB (default: 134217728)
13 ; MaxSize = 134217728
14 ; Maximal asset count
15 ; MaxCount = 4096
16 ; Asset's expiration time (minutes)
17 ; ExpirationTime = 30
18 33
19[AssetService] 34[AssetService]
20 35
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index e21f306..f22113b 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -1,5 +1,6 @@
1[Includes] 1[Includes]
2 Include-Common = "config-include/GridCommon.ini" 2 Include-Common = "config-include/GridCommon.ini"
3 Include-Stable = "config-include/StableSettings.ini"
3 4
4[Modules] 5[Modules]
5 AssetServices = "HGAssetBroker" 6 AssetServices = "HGAssetBroker"
diff --git a/bin/config-include/StableSettings.ini b/bin/config-include/StableSettings.ini
new file mode 100644
index 0000000..5e3cbbc
--- /dev/null
+++ b/bin/config-include/StableSettings.ini
@@ -0,0 +1,28 @@
1[AssetCache]
2 ;; ---- Optional configurations for CoreAssetCache
3 ; Number of buckets for assets
4 ;CacheBuckets = 32768
5 ;; ---- endof CoreAssetCache ----------------
6
7 ;; ---- Optional configurations for CenomeMemoryAssetCache
8 ; Cache size 128 MB (default: 134217728)
9 ; MaxSize = 134217728
10 ; Maximal asset count
11 ; MaxCount = 4096
12 ; Asset's expiration time (minutes)
13 ; ExpirationTime = 30
14 ;; ---- endof CenomeMemoryAssetCache --------
15
16 ;; ---- Optional configurations for FlotsamAssetCache
17
18 ; Set to false for disk cache only.
19 MemoryCacheEnabled = true
20
21 ; How long {in hours} to keep assets cached in memory, .5 == 30 minutes
22 MemoryCacheTimeout = 2
23
24 ; How often {in hours} should the disk be checked for expired filed
25 ; Specify 0 to disable expiration checking
26 FileCleanupTimer = .166 ;roughly every 10 minutes
27
28 ;; ---- endof FlotsamAssetCache --------
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index dd9fdb5..74c440e 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -1,5 +1,6 @@
1[Includes] 1[Includes]
2 Include-Common = "config-include/StandaloneCommon.ini" 2 Include-Common = "config-include/StandaloneCommon.ini"
3 Include-Stable = "config-include/StableSettings.ini"
3 4
4[Modules] 5[Modules]
5 AssetServices = "LocalAssetServicesConnector" 6 AssetServices = "LocalAssetServicesConnector"
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index d03c003..034d1e2 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -1,20 +1,7 @@
1[Modules] 1[Modules]
2 ;AssetCaching = "CoreAssetCache" 2 ;AssetCaching = "CoreAssetCache"
3 AssetCaching = "GlynnTuckerAssetCache" 3 ;AssetCaching = "GlynnTuckerAssetCache"
4 ;AssetCaching = "CenomeMemoryAssetCache" 4 AssetCaching = "CenomeMemoryAssetCache"
5
6[AssetCache]
7 ;; Optional configurations for CoreAssetCache
8 ; Number of buckets for assets
9 ;CacheBuckets = 16384
10
11 ;; Optional configurations for CenomeMemoryAssetCache
12 ; Cache size 128 MB (default: 134217728)
13 ; MaxSize = 134217728
14 ; Maximal asset count
15 ; MaxCount = 4096
16 ; Asset's expiration time (minutes)
17 ; ExpirationTime = 30
18 5
19[AssetService] 6[AssetService]
20 ; 7 ;
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index a97ac7b..7c5700e 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -1,5 +1,6 @@
1[Includes] 1[Includes]
2 Include-Common = "config-include/StandaloneCommon.ini" 2 Include-Common = "config-include/StandaloneCommon.ini"
3 Include-Stable = "config-include/StableSettings.ini"
3 4
4[Modules] 5[Modules]
5 AssetServices = "HGAssetBroker" 6 AssetServices = "HGAssetBroker"