From 0f367bd7bbc5d22d4834e1eb0f1671381485143e Mon Sep 17 00:00:00 2001 From: diva Date: Wed, 10 Jun 2009 13:18:32 +0000 Subject: Heart surgery no.2: the inventory service hooks. Several improvements in the connectors themselves. Several improvements in configurations. Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored. --- bin/config-include/CenomeCache.ini.example | 13 ++++++ bin/config-include/FlotsamCache.ini.example | 39 +++++++++++++++++ bin/config-include/Grid.ini | 8 +++- bin/config-include/GridCommon.ini.example | 58 ++++++++----------------- bin/config-include/GridHypergrid.ini | 13 +++++- bin/config-include/StableSettings.ini | 28 ------------ bin/config-include/Standalone.ini | 9 ++++ bin/config-include/StandaloneCommon.ini.example | 21 ++++++--- bin/config-include/StandaloneHypergrid.ini | 15 ++++++- 9 files changed, 126 insertions(+), 78 deletions(-) create mode 100644 bin/config-include/CenomeCache.ini.example create mode 100644 bin/config-include/FlotsamCache.ini.example delete mode 100644 bin/config-include/StableSettings.ini (limited to 'bin/config-include') diff --git a/bin/config-include/CenomeCache.ini.example b/bin/config-include/CenomeCache.ini.example new file mode 100644 index 0000000..993fe64 --- /dev/null +++ b/bin/config-include/CenomeCache.ini.example @@ -0,0 +1,13 @@ +[AssetCache] + ;; + ;; Options for CenmoeAssetCache + ;; + + ; 256 MB (default: 134217728) + MaxSize = 268435456 + + ; How many assets it is possible to store cache (default: 4096) + MaxCount = 16384 + + ; Expiration time - 1 hour (default: 30 minutes) + ExpirationTime = 60 diff --git a/bin/config-include/FlotsamCache.ini.example b/bin/config-include/FlotsamCache.ini.example new file mode 100644 index 0000000..e9e43f6 --- /dev/null +++ b/bin/config-include/FlotsamCache.ini.example @@ -0,0 +1,39 @@ +[AssetCache] + ;; + ;; Options for FlotsamAssetCache + ;; + + ; cache directory can be shared by multiple instances + CacheDirectory = ./assetcache + ; Other examples: + ;CacheDirectory = /directory/writable/by/OpenSim/instance + + ; Log level + ; 0 - (Error) Errors only + ; 1 - (Info) Hit Rate Stats + Level 0 + ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1 + ; + LogLevel = 0 + + ; How often should hit rates be displayed (given in AssetRequests) + ; 0 to disable + HitRateDisplay = 100 + + ; 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 long {in hours} to keep assets cached on disk, .5 == 30 minutes + ; Specify 0 if you do not want your disk cache to expire + FileCacheTimeout = 0 + + ; How often {in hours} should the disk be checked for expired filed + ; Specify 0 to disable expiration checking + FileCleanupTimer = .166 ;roughly every 10 minutes + + ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how + ; long (in miliseconds) to block a request thread while trying to complete + ; an existing write to disk. + ; WaitOnInprogressTimeout = 3000 diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini index 4f2e839..68326b8 100644 --- a/bin/config-include/Grid.ini +++ b/bin/config-include/Grid.ini @@ -1,7 +1,13 @@ +;; +;; Please don't change this file. +;; All optional settings are in GridCommon.ini.example, +;; which you can copy and change. +;; + [Includes] Include-Common = "config-include/GridCommon.ini" - Include-Stable = "config-include/StableSettings.ini" [Modules] AssetServices = "RemoteAssetServicesConnector" + InventoryServices = "RemoteInventoryServicesConnector" diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example index efbde56..ff324ce 100644 --- a/bin/config-include/GridCommon.ini.example +++ b/bin/config-include/GridCommon.ini.example @@ -1,43 +1,3 @@ -[Modules] - ;AssetCaching = "CoreAssetCache" - ;AssetCaching = "GlynnTuckerAssetCache" - ;AssetCaching = "CenomeMemoryAssetCache" - AssetCaching = "FlotsamAssetCache" - -[AssetCache] - ; cache directory can be shared by multiple instances - CacheDirectory = /directory/writable/by/OpenSim/instance - - ; Log level - ; 0 - (Error) Errors only - ; 1 - (Info) Hit Rate Stats + Level 0 - ; 2 - (Debug) Cache Activity (Reads/Writes) + Level 1 - ; - LogLevel = 0 - - ; How often should hit rates be displayed (given in AssetRequests) - ; 0 to disable - HitRateDisplay = 100 - - ; 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 long {in hours} to keep assets cached on disk, .5 == 30 minutes - ; Specify 0 if you do not want your disk cache to expire - FileCacheTimeout = 0 - - ; How often {in hours} should the disk be checked for expired filed - ; Specify 0 to disable expiration checking - FileCleanupTimer = .166 ;roughly every 10 minutes - - ; If WAIT_ON_INPROGRESS_REQUESTS has been defined then this specifies how - ; long (in miliseconds) to block a request thread while trying to complete - ; an existing write to disk. - ; WaitOnInprogressTimeout = 3000 - [AssetService] DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" @@ -48,3 +8,21 @@ ; AssetServerURI = "http://myassetserver.com:8003" +[InventoryService] + ; + ; change this to your grid-wide asset server + ; + InventoryServerURI = "http://myassetserver.com:8004" + + +[Modules] + ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. + ;; Copy the config .example file into your own .ini file and change configs there + + AssetCaching = "FlotsamAssetCache" + Include-FlotsamCache = "config-include/FlotsamCache.ini" + + ;AssetCaching = "CenomeMemoryAssetCache" + ;Include-CenomeCache = "config-include/CenomeCache.ini" + + ;AssetCaching = "GlynnTuckerAssetCache" diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini index f22113b..abac345 100644 --- a/bin/config-include/GridHypergrid.ini +++ b/bin/config-include/GridHypergrid.ini @@ -1,11 +1,20 @@ +;; +;; Please don't change this file. +;; All optional settings are in GridCommon.ini.example, +;; which you can copy and change. +;; + [Includes] Include-Common = "config-include/GridCommon.ini" - Include-Stable = "config-include/StableSettings.ini" [Modules] AssetServices = "HGAssetBroker" - + InventoryServices = "HGInventoryBroker" [AssetService] LocalGridAssetService = "OpenSim.Services.Connectors.dll:AssetServicesConnector" HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService" + +[InventoryService] + LocalGridInventoryService = "OpenSim.Services.Connectors.dll:InventoryServicesConnector" + HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService" diff --git a/bin/config-include/StableSettings.ini b/bin/config-include/StableSettings.ini deleted file mode 100644 index 5e3cbbc..0000000 --- a/bin/config-include/StableSettings.ini +++ /dev/null @@ -1,28 +0,0 @@ -[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 74c440e..a0cd098 100644 --- a/bin/config-include/Standalone.ini +++ b/bin/config-include/Standalone.ini @@ -1,11 +1,20 @@ +;; +;; Please don't change this file. +;; All optional settings are in StandaloneCommon.ini.example, +;; which you can copy and change. +;; + [Includes] Include-Common = "config-include/StandaloneCommon.ini" Include-Stable = "config-include/StableSettings.ini" [Modules] AssetServices = "LocalAssetServicesConnector" + InventoryServices = "LocalInventoryServicesConnector" [AssetService] LocalServiceModule = "OpenSim.Services.AssetService.dll:AssetService" +[InventoryService] + LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example index 034d1e2..41112ef 100644 --- a/bin/config-include/StandaloneCommon.ini.example +++ b/bin/config-include/StandaloneCommon.ini.example @@ -1,9 +1,4 @@ -[Modules] - ;AssetCaching = "CoreAssetCache" - ;AssetCaching = "GlynnTuckerAssetCache" - AssetCaching = "CenomeMemoryAssetCache" - -[AssetService] +[DatabaseService] ; ;### Choose the DB ; @@ -13,6 +8,20 @@ ;StorageProvider = "OpenSim.Data.MySQL.dll" ;ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=***;" +[AssetService] + DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll" AssetLoaderArgs = "assets/AssetSets.xml" + +[Modules] + ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists. + ;; Copy the config .example file into your own .ini file and change configs there + + ;AssetCaching = "GlynnTuckerAssetCache" + + ;AssetCaching = "FlotsamAssetCache" + ;Include-FlotsamCache = "config-include/FlotsamCache.ini" + + AssetCaching = "CenomeMemoryAssetCache" + Include-CenomeCache = "config-include/CenomeCache.ini" diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini index 7c5700e..f962132 100644 --- a/bin/config-include/StandaloneHypergrid.ini +++ b/bin/config-include/StandaloneHypergrid.ini @@ -1,9 +1,15 @@ +;; +;; Please don't change this file. +;; All optional settings are in StandaloneCommon.ini.example, +;; which you can copy and change. +;; + [Includes] Include-Common = "config-include/StandaloneCommon.ini" - Include-Stable = "config-include/StableSettings.ini" [Modules] AssetServices = "HGAssetBroker" + InventoryServices = "HGInventoryBroker" [AssetService] @@ -14,3 +20,10 @@ LocalGridAssetService = "OpenSim.Services.AssetService.dll:AssetService" HypergridAssetService = "OpenSim.Services.AssetService.dll:HGAssetService" +[InventoryService] + ; For the RegionInventoryService + LocalServiceModule = "OpenSim.Services.InventoryService.dll:InventoryService" + + ; For HGInventoryBroker + LocalGridInventoryService = "OpenSim.Services.InventoryService.dll:InventoryService" + HypergridInventoryService = "OpenSim.Services.InventoryService.dll:HGInventoryService" -- cgit v1.1