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/Framework/Console/LocalConsole.cs | 4 ++-- OpenSim/Framework/Util.cs | 15 +++++++++++++-- OpenSim/Region/Application/ConfigurationLoader.cs | 5 ++--- OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | 4 ++-- .../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 ++-- OpenSim/Server/Base/ServicesServerBase.cs | 2 +- OpenSim/Server/Handlers/BakedTextures/XBakes.cs | 7 +------ OpenSim/Services/GridService/HypergridLinker.cs | 3 ++- OpenSim/Services/MapImageService/MapImageService.cs | 2 +- OpenSim/Tests/Robust/Server/DemonServer.cs | 4 ++-- 13 files changed, 31 insertions(+), 25 deletions(-) mode change 100755 => 100644 OpenSim/Region/ScriptEngine/XEngine/XEngine.cs (limited to 'OpenSim') diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index 73f0323..fac346a 100644 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs @@ -95,9 +95,9 @@ namespace OpenSim.Framework.Console return; } - string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", "OpenSimConsoleHistory.txt"); + string m_historyFile = startupConfig.GetString("ConsoleHistoryFile", Path.Combine(Util.logsDir(), "OpenSimConsoleHistory.txt")); int m_historySize = startupConfig.GetInt("ConsoleHistoryFileLines", 100); - m_historyPath = Path.GetFullPath(Path.Combine(Util.configDir(), m_historyFile)); + m_historyPath = Path.GetFullPath(m_historyFile); m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1}", m_historySize, m_historyPath); if (File.Exists(m_historyPath)) diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 2f65f3c..a448b31 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -1282,8 +1282,14 @@ namespace OpenSim.Framework return Path.Combine("..", Path.Combine("..", "db")); } + public static string cacheDir() + { + return Path.Combine("..", Path.Combine("..", "caches")); + } + public static string configDir() { +// return Path.Combine("..", Path.Combine("..", "config")); return "."; } @@ -1292,6 +1298,11 @@ namespace OpenSim.Framework return "."; } + public static string logsDir() + { + return Path.Combine("..", "logs"); + } + public static string logFile() { foreach (IAppender appender in LogManager.GetRepository().GetAppenders()) @@ -1302,7 +1313,7 @@ namespace OpenSim.Framework } } - return "./OpenSim.log"; + return Path.Combine(logsDir(), "OpenSim.log"); } public static string statsLogFile() @@ -1315,7 +1326,7 @@ namespace OpenSim.Framework } } - return "./OpenSimStats.log"; + return Path.Combine(logsDir(), "OpenSimStats.log"); } public static string logDir() 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())}; diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 176e876..1484ee0 100644 --- a/OpenSim/Server/Base/ServicesServerBase.cs +++ b/OpenSim/Server/Base/ServicesServerBase.cs @@ -85,7 +85,7 @@ namespace OpenSim.Server.Base string fileName = ""; if (Assembly.GetEntryAssembly() != null) fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location); - string iniFile = fileName + ".ini"; + string iniFile = Util.configDir() + fileName + ".ini"; string logConfig = null; IConfig startupConfig = argvConfig.Configs["Startup"]; diff --git a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs index 4e55433..0c74564 100644 --- a/OpenSim/Server/Handlers/BakedTextures/XBakes.cs +++ b/OpenSim/Server/Handlers/BakedTextures/XBakes.cs @@ -67,12 +67,7 @@ namespace OpenSim.Server.Handlers.BakedTextures throw new Exception("No BakedTextureService configuration"); } - m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty); - if (m_FSBase == String.Empty) - { - m_log.ErrorFormat("[BAKES]: BaseDirectory not specified"); - throw new Exception("Configuration error"); - } + m_FSBase = assetConfig.GetString("BaseDirectory", Util.cacheDir() + "/bakes"); m_log.Info("[BAKES]: XBakes service enabled"); } diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index dabfd3b..67114ef 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -122,7 +122,8 @@ namespace OpenSim.Services.GridService // m_Check4096 = gridConfig.GetBoolean("Check4096", true); - m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); +//// TODO OpenSim is crazy, this is called from Robust and OpenSim, Robust needs the ../caches bit, OpenSim somehow adds a path already. I can't tell why. So strip the path. + m_MapTileDirectory = Path.Combine(Util.cacheDir(), Path.GetFileName(gridConfig.GetString("MapTileDirectory", "maptiles"))); m_ThisGatekeeper = Util.GetConfigVarFromSections(config, "GatekeeperURI", new string[] { "Startup", "Hypergrid", "GridService" }, String.Empty); diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs index c90f5bd..e9db41d 100644 --- a/OpenSim/Services/MapImageService/MapImageService.cs +++ b/OpenSim/Services/MapImageService/MapImageService.cs @@ -63,7 +63,7 @@ namespace OpenSim.Services.MapImageService private const int HALF_WIDTH = 128; private const int JPEG_QUALITY = 80; - private static string m_TilesStoragePath = "maptiles"; + private static string m_TilesStoragePath = Path.Combine(Util.cacheDir(), "/maptiles"); private static object m_Sync = new object(); private static bool m_Initialized = false; diff --git a/OpenSim/Tests/Robust/Server/DemonServer.cs b/OpenSim/Tests/Robust/Server/DemonServer.cs index 1e0797e..41c2185 100644 --- a/OpenSim/Tests/Robust/Server/DemonServer.cs +++ b/OpenSim/Tests/Robust/Server/DemonServer.cs @@ -48,8 +48,8 @@ namespace Robust.Tests [SetUp] public void StartDemon() { - if (File.Exists("Robust.Tests.log")) - File.Delete("Robust.Tests.log"); + if (File.Exists("../../logs/Robust.Tests.log")) + File.Delete("../../logs/Robust.Tests.log"); Console.WriteLine("**** Starting demon Robust server ****"); m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"})); -- cgit v1.1