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

Fix a recent regression in e17392a where JsonSetValue() stopped working (probably other functions as well). 

Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten.
This was actually picked up by the TestJsonSetValue() regression test failing
But this isn't being run on jenkins due to the .net version issue.
This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
0.7.4-extended
Justin Clark-Casey (justincc) 2013-02-07 23:08:19 +00:00
parent 365292e38f
commit 001bbb0b16
3 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
View File

@ -103,13 +103,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
return PathExpressionToKey(ParsePathExpression(path));
}
// -----------------------------------------------------------------
/// <summary>
///
/// </summary>
// -----------------------------------------------------------------
public JsonStore() : this("") {}
public JsonStore(string value)
{
m_TakeStore = new List<TakeValueCallbackClass>();

18
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
View File

@ -93,12 +93,12 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
}
catch (Exception e)
{
m_log.ErrorFormat("[JsonStore] initialization error: {0}",e.Message);
m_log.Error("[JsonStore]: initialization error: {0}", e);
return;
}
if (m_enabled)
m_log.DebugFormat("[JsonStore] module is enabled");
m_log.DebugFormat("[JsonStore]: module is enabled");
}
// -----------------------------------------------------------------
@ -191,7 +191,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
}
catch (Exception e)
{
m_log.InfoFormat("[JsonStore] Unable to initialize store from {0}; {1}",value,e.Message);
m_log.Error(string.Format("[JsonStore]: Unable to initialize store from {0}", value), e);
return false;
}
@ -255,7 +255,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
}
catch (Exception e)
{
m_log.InfoFormat("[JsonStore] Path test failed for {0} in {1}; {2}",path,storeID,e.Message);
m_log.Error(string.Format("[JsonStore]: Path test failed for {0} in {1}", path, storeID), e);
}
return false;
@ -288,7 +288,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
}
catch (Exception e)
{
m_log.InfoFormat("[JsonStore] Unable to assign {0} to {1} in {2}; {3}",value,path,storeID,e.Message);
m_log.Error(string.Format("[JsonStore]: Unable to assign {0} to {1} in {2}", value, path, storeID), e);
}
return false;
@ -321,7 +321,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
}
catch (Exception e)
{
m_log.InfoFormat("[JsonStore] Unable to remove {0} in {1}; {2}",path,storeID,e.Message);
m_log.Error(string.Format("[JsonStore]: Unable to remove {0} in {1}", path, storeID), e);
}
return false;
@ -354,7 +354,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
}
catch (Exception e)
{
m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.Message);
m_log.Error("[JsonStore]: unable to retrieve value", e);
}
return false;
@ -393,7 +393,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
}
catch (Exception e)
{
m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.ToString());
m_log.Error("[JsonStore] unable to retrieve value", e);
}
cback(String.Empty);
@ -432,7 +432,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
}
catch (Exception e)
{
m_log.InfoFormat("[JsonStore] unable to retrieve value; {0}",e.ToString());
m_log.Error("[JsonStore]: unable to retrieve value", e);
}
cback(String.Empty);

8
OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
View File

@ -205,13 +205,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
TestHelpers.InMethod();
// TestHelpers.EnableLogging();
UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{}");
UUID storeId = (UUID)InvokeOp("JsonCreateStore", "{ }");
int result = (int)InvokeOp("JsonSetValue", storeId, "Hello", "World");
int result = (int)InvokeOp("JsonSetValue", storeId, "Fun", "Times");
Assert.That(result, Is.EqualTo(1));
string value = (string)InvokeOp("JsonGetValue", storeId, "Hello");
Assert.That(value, Is.EqualTo("World"));
string value = (string)InvokeOp("JsonGetValue", storeId, "Fun");
Assert.That(value, Is.EqualTo("Times"));
}
/// <summary>