From dcfd54b7608093d509cd045a152a4cde7317f66f Mon Sep 17 00:00:00 2001 From: onefang Date: Tue, 8 Sep 2020 21:17:45 +1000 Subject: Move various paths out of the bin directory. --- OpenSim/Data/SQLite/SQLiteAssetData.cs | 4 ++-- OpenSim/Data/Tests/BasicDataServiceTest.cs | 2 +- .../Data/Tests/Resources/TestDataConnections.ini | 4 ++-- OpenSim/Framework/Console/LocalConsole.cs | 4 ++-- OpenSim/Framework/Util.cs | 25 ++++++++++++++++++++-- OpenSim/Region/Application/ConfigurationLoader.cs | 5 ++--- .../Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 +- .../World/Warp3DMap/Warp3DImageModule.cs | 8 ++++++- .../UserStatistics/WebStatsModule.cs | 4 ++-- .../Meshing/Meshmerizer/Meshmerizer.cs | 2 +- .../PhysicsModules/ubOdeMeshing/Meshmerizer.cs | 2 +- .../Region/ScriptEngine/Shared/AssemblyResolver.cs | 2 +- OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | 2 +- OpenSim/Server/Base/ServicesServerBase.cs | 2 +- OpenSim/Server/Handlers/BakedTextures/XBakes.cs | 7 +----- OpenSim/Services/GridService/HypergridLinker.cs | 3 ++- .../Services/MapImageService/MapImageService.cs | 2 +- OpenSim/Tests/Robust/Server/DemonServer.cs | 4 ++-- 18 files changed, 53 insertions(+), 31 deletions(-) (limited to 'OpenSim') diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs index 966d0b8..51d1030 100644 --- a/OpenSim/Data/SQLite/SQLiteAssetData.cs +++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs @@ -86,7 +86,7 @@ namespace OpenSim.Data.SQLite if (dbconnect == string.Empty) { - dbconnect = "URI=file:Asset.db,version=3"; + dbconnect = "URI=file:" + Util.dbDir() + "Asset.db,version=3"; } m_conn = new SqliteConnection(dbconnect); m_conn.Open(); @@ -360,7 +360,7 @@ namespace OpenSim.Data.SQLite /// override public void Initialise() { - Initialise("URI=file:Asset.db,version=3"); + Initialise("URI=file:" + Util.dbDir() + "Asset.db,version=3"); } /// diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs index 79691e4..580e7aa 100644 --- a/OpenSim/Data/Tests/BasicDataServiceTest.cs +++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs @@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests if (String.IsNullOrEmpty(m_connStr)) { m_file = Path.GetTempFileName() + ".db"; - m_connStr = "URI=file:" + m_file + ",version=3"; + m_connStr = "URI=file:" + Util.dbDir() + "/" + m_file + ",version=3"; } } diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini index 7b55467..2ddec8b 100644 --- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini +++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini @@ -16,9 +16,9 @@ ; file for the DB. If you want the resulting DB to persist (e.g. for performance testing, ; when filling up the tables can take a long time), explicitly specify a conn string like this: -; SqliteConnection="URI=file:,version=3" +; SqliteConnection="URI=file:../../db/,version=3" [TestConnections] MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;" SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;" -SqliteConnection="URI=file:opensim-nunit.db,version=3" \ No newline at end of file +SqliteConnection="URI=file:../../db/opensim-nunit.db,version=3" diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs index e1492b8..f84d21c 100755 --- a/OpenSim/Framework/Console/LocalConsole.cs +++ b/OpenSim/Framework/Console/LocalConsole.cs @@ -96,9 +96,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_historytimestamps = startupConfig.GetBoolean("ConsoleHistoryTimeStamp", false); m_log.InfoFormat("[LOCAL CONSOLE]: Persistent command line history is Enabled, up to {0} lines from file {1} {2} timestamps", m_historySize, m_historyPath, m_historytimestamps?"with":"without"); diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index e0e35db..cc449af 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs @@ -1304,8 +1304,19 @@ namespace OpenSim.Framework return Path.Combine(configDir(), "inventory"); } + public static string dbDir() + { + 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 "."; } @@ -1314,6 +1325,16 @@ namespace OpenSim.Framework return "."; } + public static string logsDir() + { + return Path.Combine("..", "logs"); + } + + public static string webDir() + { + return Path.Combine("..", Path.Combine("..", "web")); + } + public static string logFile() { foreach (IAppender appender in LogManager.GetRepository().GetAppenders()) @@ -1324,7 +1345,7 @@ namespace OpenSim.Framework } } - return "./OpenSim.log"; + return Path.Combine(logsDir(), "OpenSim.log"); } public static string statsLogFile() @@ -1337,7 +1358,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 66e46cb..02a9941 100644 --- a/OpenSim/Region/Application/ConfigurationLoader.cs +++ b/OpenSim/Region/Application/ConfigurationLoader.cs @@ -153,15 +153,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 bbf7be7..238fbab 100755 --- 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(); diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 4c922ba..ce5e167 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs @@ -83,6 +83,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap private bool m_texturePrims = true; // true if should texture the rendered prims private float m_texturePrimSize = 48f; // size of prim before we consider texturing it private bool m_renderMeshes = false; // true if to render meshes rather than just bounding boxes + private String m_cacheDirectory = ""; private float m_renderMinHeight = -100f; private float m_renderMaxHeight = 4096f; @@ -119,6 +120,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap Util.GetConfigVarFromSections(m_config, "TexturePrimSize", configSections, m_texturePrimSize); m_renderMeshes = Util.GetConfigVarFromSections(m_config, "RenderMeshes", configSections, m_renderMeshes); + m_cacheDirectory + = Util.GetConfigVarFromSections(m_config, "CacheDirectory", configSections, System.IO.Path.Combine(Util.cacheDir(), "MapImageCache")); + + if (!Directory.Exists(m_cacheDirectory)) + Directory.CreateDirectory(m_cacheDirectory); m_renderMaxHeight = Util.GetConfigVarFromSections(m_config, "RenderMaxHeight", configSections, m_renderMaxHeight); m_renderMinHeight = Util.GetConfigVarFromSections(m_config, "RenderMinHeight", configSections, m_renderMinHeight); @@ -210,7 +216,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap Bitmap tile = GenImage(); // image may be reloaded elsewhere, so no compression format - string filename = "MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png"; + string filename = System.IO.Path.Combine(m_cacheDirectory,"MAP-" + m_scene.RegionInfo.RegionID.ToString() + ".png"); tile.Save(filename, ImageFormat.Png); m_primMesher = null; return tile; diff --git a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs index c15b194..f76b057 100644 --- a/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs +++ b/OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs @@ -96,7 +96,7 @@ namespace OpenSim.Region.UserStatistics //IConfig startupConfig = config.Configs["Startup"]; - dbConn = new SqliteConnection("URI=file:LocalUserStatistics.db,version=3"); + dbConn = new SqliteConnection("URI=file:" + Util.dbDir() + "/LocalUserStatistics.db,version=3"); dbConn.Open(); CreateTables(dbConn); @@ -1200,4 +1200,4 @@ VALUES m_scriptLinesPerSecond = stats.ExtraStatsBlock[0].StatValue; } } -} \ No newline at end of file +} diff --git a/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs b/OpenSim/Region/PhysicsModules/Meshing/Meshmerizer/Meshmerizer.cs index de39d0e..93c2986 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 ac32f75..66c376c 100644 --- a/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs +++ b/OpenSim/Region/PhysicsModules/ubOdeMeshing/Meshmerizer.cs @@ -64,7 +64,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 index 9e47530..b225aad 100755 --- 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) diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs index 3bede45..8c16f61 100755 --- 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 = Path.Combine(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 9c66e3d..4f5fe59 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs @@ -95,7 +95,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_ThisGatekeeperURI = 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 30d3e41..9c5e0bb 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