ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fsassets: only read SecondaryInstance option on per process mmain instances

Browse Source
This commit is contained in:
UbitUmarov
2022-07-11 20:22:55 +01:00
parent 8db18bb54a
commit 80dc993087
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Services/FSAssetService/FSAssetService.cs
View File

@@ -86,12 +86,16 @@ namespace OpenSim.Services.FSAssetService
public FSAssetConnector(IConfigSource config, string configName) : base(config)
{
lock(m_initLock)
IConfig assetConfig = config.Configs[configName];
if (assetConfig == null)
throw new Exception("No AssetService configuration");
lock (m_initLock)
{
if (!m_mainInitialized)
{
m_mainInitialized = true;
m_isMainInstance = true;
m_isMainInstance = !assetConfig.GetBoolean("SecondaryInstance", false);
MainConsole.Instance.Commands.AddCommand("fs", false,
"show assets", "show assets", "Show asset stats",
@@ -118,16 +122,6 @@ namespace OpenSim.Services.FSAssetService
}
}
IConfig assetConfig = config.Configs[configName];
if (assetConfig == null)
throw new Exception("No AssetService configuration");
bool secondary = assetConfig.GetBoolean("SecondaryInstance", false);
lock (m_initLock)
m_isMainInstance = !secondary;
// Get Database Connector from Asset Config (If present)
string dllName = assetConfig.GetString("StorageProvider", string.Empty);
string connectionString = assetConfig.GetString("ConnectionString", string.Empty);