OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: use existing Compiler.CreateScriptsDirectory() (renamed to CheckOrCreateScriptsDirectory()) when checking that scripts directory exists on compile. 

Code was identical apart from error logging, but if there are failures creating these directories then you'll be
seeing lots of errors anyway, and these will be more informative
bullet-2.82
Justin Clark-Casey (justincc) 2014-07-10 19:40:44 +01:00
parent fea18a909f
commit 6d3b409af2
1 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
View File

@ -120,7 +120,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
if (in_startup) if (in_startup)
{ {
in_startup = false; in_startup = false;
CreateScriptsDirectory(); CheckOrCreateScriptsDirectory();
// First time we start? Delete old files // First time we start? Delete old files
if (DeleteScriptsOnStartup) if (DeleteScriptsOnStartup)
@ -189,13 +189,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
} }
// We now have an allow-list, a mapping list, and a default language // We now have an allow-list, a mapping list, and a default language
} }
/// <summary> /// <summary>
/// Create the directory where compiled scripts are stored. /// Create the directory where compiled scripts are stored if it does not already exist.
/// </summary> /// </summary>
private void CreateScriptsDirectory() private void CheckOrCreateScriptsDirectory()
{ {
if (!Directory.Exists(ScriptEnginesPath)) if (!Directory.Exists(ScriptEnginesPath))
{ {
@ -302,28 +301,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
assembly = GetCompilerOutput(asset); assembly = GetCompilerOutput(asset);
if (!Directory.Exists(ScriptEnginesPath)) CheckOrCreateScriptsDirectory();
{
try
{
Directory.CreateDirectory(ScriptEnginesPath);
}
catch (Exception)
{
}
}
if (!Directory.Exists(Path.Combine(ScriptEnginesPath,
m_scriptEngine.World.RegionInfo.RegionID.ToString())))
{
try
{
Directory.CreateDirectory(ScriptEnginesPath);
}
catch (Exception)
{
}
}
// Don't recompile if we already have it // Don't recompile if we already have it
// Performing 3 file exists tests for every script can still be slow // Performing 3 file exists tests for every script can still be slow