From 295e91b8f44a356ab742dedd27c1b7edfe7b1157 Mon Sep 17 00:00:00 2001 From: onefang Date: Sun, 19 May 2019 22:15:41 +1000 Subject: Move cache, config, logs out of tree, and various related clean ups. --- OpenSim/Region/Application/ConfigurationLoader.cs | 5 ++--- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 ++-- OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs | 2 +- OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 +- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 4 ++-- 6 files changed, 9 insertions(+), 10 deletions(-) mode change 100755 => 100644 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs (limited to 'OpenSim/Region') diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs index 62bd4f4..19db7a9 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -154,15 +154,14 @@ namespace OpenSim } // Override distro settings with contents of inidirectory - string iniDirName = startupConfig.GetString("inidirectory", "config"); - string iniDirPath = Path.Combine(Util.configDir(), iniDirName); + string iniDirPath = startupConfig.GetString("inidirectory", Util.configDir()); if (Directory.Exists(iniDirPath)) { m_log.InfoFormat("[CONFIG]: Searching folder {0} for config ini files", iniDirPath); List overrideSources = new List(); - string[] fileEntries = Directory.GetFiles(iniDirName); + string[] fileEntries = Directory.GetFiles(iniDirPath); foreach (string filePath in fileEntries) { if (Path.GetExtension(filePath).ToLower() == ".ini") diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index c1bf544..bb0f424 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.Asset private bool m_cleanupRunning; private const string m_ModuleName = "FlotsamAssetCache"; - private const string m_DefaultCacheDirectory = "./assetcache"; + private const string m_DefaultCacheDirectory = "assetcache"; private string m_CacheDirectory = m_DefaultCacheDirectory; private readonly List m_InvalidChars = new List(); @@ -159,7 +159,7 @@ namespace OpenSim.Region.CoreModules.Asset else { m_FileCacheEnabled = assetConfig.GetBoolean("FileCacheEnabled", m_FileCacheEnabled); - m_CacheDirectory = assetConfig.GetString("CacheDirectory", m_DefaultCacheDirectory); + m_CacheDirectory = assetConfig.GetString("CacheDirectory", Path.Combine(Util.cacheDir(), m_DefaultCacheDirectory)); m_MemoryCacheEnabled = assetConfig.GetBoolean("MemoryCacheEnabled", m_MemoryCacheEnabled); m_MemoryExpiration = assetConfig.GetDouble("MemoryCacheTimeout", m_MemoryExpiration); diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs index 0d4b6b9..a90ef3b 100644 --- a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs @@ -99,7 +99,7 @@ namespace OpenSim.Region.PhysicsModule.Meshing IConfig mesh_config = source.Configs["Mesh"]; - decodedSculptMapPath = config.GetString("DecodedSculptMapPath", "j2kDecodeCache"); + decodedSculptMapPath = config.GetString("DecodedSculptMapPath", System.IO.Path.Combine(Util.cacheDir(), "j2kDecodeCache")); cacheSculptMaps = config.GetBoolean("CacheSculptMaps", cacheSculptMaps); if (mesh_config != null) { diff --git a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs index 032d4ed..c34c9fa 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs @@ -63,7 +63,7 @@ namespace OpenSim.Region.PhysicsModule.ubODEMeshing public bool doMeshFileCache = true; public bool doCacheExpire = true; - public string cachePath = "MeshCache"; + public string cachePath = System.IO.Path.Combine(Util.cacheDir(), "MeshCache"); public TimeSpan CacheExpire; // const string baseDir = "rawFiles"; diff --git a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs index e35f79f..6c42e2e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs +++ b/OpenSim/Region/ScriptEngine/Shared/AssemblyResolver.cs @@ -44,7 +44,7 @@ namespace OpenSim.Region.ScriptEngine.Shared string dirName = myDomain.FriendlyName; string ScriptEnginesPath = myDomain.SetupInformation.PrivateBinPath; - string[] pathList = new string[] {"", "bin", ScriptEnginesPath, + string[] pathList = new string[] {"", "caches", ScriptEnginesPath, Path.Combine(ScriptEnginesPath, dirName)}; string assemblyName = args.Name; diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs old mode 100755 new mode 100644 index 05124fc..da5b77a --- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs @@ -315,7 +315,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine m_WaitForEventCompletionOnScriptStop = m_ScriptConfig.GetInt("WaitForEventCompletionOnScriptStop", m_WaitForEventCompletionOnScriptStop); - m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", "ScriptEngines"); + m_ScriptEnginesPath = m_ScriptConfig.GetString("ScriptEnginesPath", Path.Combine(Util.cacheDir(), "ScriptEngines")); m_Prio = ThreadPriority.BelowNormal; switch (priority) @@ -1874,7 +1874,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine if (!(sender is System.AppDomain)) return null; - string[] pathList = new string[] {"bin", m_ScriptEnginesPath, + string[] pathList = new string[] {"caches", m_ScriptEnginesPath, Path.Combine(m_ScriptEnginesPath, m_Scene.RegionInfo.RegionID.ToString())}; -- cgit v1.1