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

Massive console refactor. Greatly simplify interface.

Browse Source
This commit is contained in:
Melanie
2019-08-20 23:28:59 +01:00
parent f7a496136d
commit 0fd17c08ae
56 changed files with 430 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/OptionalModules/Agent/TextureSender/J2KDecoderCommandModule.cs Normal file → Executable file
View File

@@ -114,27 +114,27 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
if (!UUID.TryParse(rawAssetId, out assetId))
{
MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", null, rawAssetId);
return;
}
AssetBase asset = m_scene.AssetService.Get(assetId.ToString());
if (asset == null)
{
MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
MainConsole.Instance.Output("ERROR: No asset found with ID {0}", null, assetId);
return;
}
if (asset.Type != (sbyte)AssetType.Texture)
{
MainConsole.Instance.OutputFormat("ERROR: Asset {0} is not a texture type", assetId);
MainConsole.Instance.Output("ERROR: Asset {0} is not a texture type", null, assetId);
return;
}
IJ2KDecoder decoder = m_scene.RequestModuleInterface<IJ2KDecoder>();
if (decoder == null)
{
MainConsole.Instance.OutputFormat("ERROR: No IJ2KDecoder module available");
MainConsole.Instance.Output("ERROR: No IJ2KDecoder module available");
return;
}
@@ -142,13 +142,14 @@ namespace OpenSim.Region.OptionalModules.Agent.TextureSender
int components;
if (decoder.Decode(assetId, asset.Data, out layers, out components))
{
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Successfully decoded asset {0} with {1} layers and {2} components",
null,
assetId, layers.Length, components);
}
else
{
MainConsole.Instance.OutputFormat("Decode of asset {0} failed", assetId);
MainConsole.Instance.Output("Decode of asset {0} failed", null, assetId);
}
}
}

20
OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs Normal file → Executable file
View File

@@ -115,14 +115,14 @@ namespace OpenSim.Region.OptionalModules.Asset
if (!UUID.TryParse(rawAssetId, out assetId))
{
MainConsole.Instance.OutputFormat("ERROR: {0} is not a valid ID format", rawAssetId);
MainConsole.Instance.Output("ERROR: {0} is not a valid ID format", null, rawAssetId);
return;
}
AssetBase asset = m_scene.AssetService.Get(assetId.ToString());
if (asset == null)
{
MainConsole.Instance.OutputFormat("ERROR: No asset found with ID {0}", assetId);
MainConsole.Instance.Output("ERROR: No asset found with ID {0}", null, assetId);
return;
}
@@ -139,7 +139,7 @@ namespace OpenSim.Region.OptionalModules.Asset
}
}
MainConsole.Instance.OutputFormat("Asset dumped to file {0}", fileName);
MainConsole.Instance.Output("Asset dumped to file {0}", null, fileName);
}
void HandleShowAsset(string module, string[] args)
@@ -160,13 +160,13 @@ namespace OpenSim.Region.OptionalModules.Asset
int i;
MainConsole.Instance.OutputFormat("Name: {0}", asset.Name);
MainConsole.Instance.OutputFormat("Description: {0}", asset.Description);
MainConsole.Instance.OutputFormat("Type: {0} (type number = {1})", (AssetType)asset.Type, asset.Type);
MainConsole.Instance.OutputFormat("Content-type: {0}", asset.Metadata.ContentType);
MainConsole.Instance.OutputFormat("Size: {0} bytes", asset.Data.Length);
MainConsole.Instance.OutputFormat("Temporary: {0}", asset.Temporary ? "yes" : "no");
MainConsole.Instance.OutputFormat("Flags: {0}", asset.Metadata.Flags);
MainConsole.Instance.Output("Name: {0}", null, asset.Name);
MainConsole.Instance.Output("Description: {0}", null, asset.Description);
MainConsole.Instance.Output("Type: {0} (type number = {1})", null, (AssetType)asset.Type, asset.Type);
MainConsole.Instance.Output("Content-type: {0}", null, asset.Metadata.ContentType);
MainConsole.Instance.Output("Size: {0} bytes", null, asset.Data.Length);
MainConsole.Instance.Output("Temporary: {0}", null, asset.Temporary ? "yes" : "no");
MainConsole.Instance.Output("Flags: {0}", null, asset.Metadata.Flags);
for (i = 0 ; i < 5 ; i++)
{

2
OpenSim/Region/OptionalModules/Avatar/Animations/AnimationsCommandModule.cs Normal file → Executable file
View File

@@ -109,7 +109,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Animations
{
if (cmd.Length != 2 && cmd.Length < 4)
{
MainConsole.Instance.OutputFormat("Usage: show animations [<first-name> <last-name>]");
MainConsole.Instance.Output("Usage: show animations [<first-name> <last-name>]");
return;
}

37
OpenSim/Region/OptionalModules/Avatar/Appearance/AppearanceInfoModule.cs Normal file → Executable file
View File

@@ -154,7 +154,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
{
if (cmd.Length != 2 && cmd.Length < 4)
{
MainConsole.Instance.OutputFormat("Usage: appearance send [<first-name> <last-name>]");
MainConsole.Instance.Output("Usage: appearance send [<first-name> <last-name>]");
return;
}
@@ -178,8 +178,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName);
if (sp != null && !sp.IsChildAgent)
{
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Sending appearance information for {0} to all other avatars in {1}",
null,
sp.Name, scene.RegionInfo.RegionName);
scene.AvatarFactory.SendAppearance(sp.UUID);
@@ -190,8 +191,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
scene.ForEachRootScenePresence(
sp =>
{
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Sending appearance information for {0} to all other avatars in {1}",
null,
sp.Name, scene.RegionInfo.RegionName);
scene.AvatarFactory.SendAppearance(sp.UUID);
@@ -206,7 +208,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
{
if (cmd.Length != 2 && cmd.Length < 4)
{
MainConsole.Instance.OutputFormat("Usage: appearance show [<first-name> <last-name>]");
MainConsole.Instance.Output("Usage: appearance show [<first-name> <last-name>]");
return;
}
@@ -229,7 +231,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
{
ScenePresence sp = scene.GetScenePresence(optionalTargetFirstName, optionalTargetLastName);
if (sp != null && !sp.IsChildAgent)
scene.AvatarFactory.WriteBakedTexturesReport(sp, MainConsole.Instance.OutputFormat);
scene.AvatarFactory.WriteBakedTexturesReport(sp, MainConsole.Instance.Output);
}
else
{
@@ -237,8 +239,8 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
sp =>
{
bool bakedTextureValid = scene.AvatarFactory.ValidateBakedTextureCache(sp);
MainConsole.Instance.OutputFormat(
"{0} baked appearance texture is {1}", sp.Name, bakedTextureValid ? "OK" : "incomplete");
MainConsole.Instance.Output(
"{0} baked appearance texture is {1}", null, sp.Name, bakedTextureValid ? "OK" : "incomplete");
}
);
}
@@ -250,7 +252,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
{
if (cmd.Length != 4)
{
MainConsole.Instance.OutputFormat("Usage: appearance rebake <first-name> <last-name>");
MainConsole.Instance.Output("Usage: appearance rebake <first-name> <last-name>");
return;
}
@@ -267,12 +269,14 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
int rebakesRequested = scene.AvatarFactory.RequestRebake(sp, false);
if (rebakesRequested > 0)
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Requesting rebake of {0} uploaded textures for {1} in {2}",
null,
rebakesRequested, sp.Name, scene.RegionInfo.RegionName);
else
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"No texture IDs available for rebake request for {0} in {1}",
null,
sp.Name, scene.RegionInfo.RegionName);
}
}
@@ -283,7 +287,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
{
if (cmd.Length != 3)
{
MainConsole.Instance.OutputFormat("Usage: appearance find <uuid-or-start-of-uuid>");
MainConsole.Instance.Output("Usage: appearance find <uuid-or-start-of-uuid>");
return;
}
@@ -310,12 +314,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
if (matchedAvatars.Count == 0)
{
MainConsole.Instance.OutputFormat("{0} did not match any baked avatar textures in use", rawUuid);
MainConsole.Instance.Output("{0} did not match any baked avatar textures in use", null, rawUuid);
}
else
{
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"{0} matched {1}",
null,
rawUuid,
string.Join(", ", matchedAvatars.ToList().ConvertAll<string>(sp => sp.Name).ToArray()));
}
@@ -325,7 +330,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
{
if (cmd.Length != 2 && cmd.Length < 4)
{
MainConsole.Instance.OutputFormat("Usage: wearables show [<first-name> <last-name>]");
MainConsole.Instance.Output("Usage: wearables show [<first-name> <last-name>]");
return;
}
@@ -388,7 +393,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
{
if (cmd.Length != 4)
{
MainConsole.Instance.OutputFormat("Usage: wearables check <first-name> <last-name>");
MainConsole.Instance.Output("Usage: wearables check <first-name> <last-name>");
return;
}
@@ -410,7 +415,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Appearance
AvatarWearable[] wearables = sp.Appearance.Wearables;
if(wearables.Count() == 0)
{
MainConsole.Instance.OutputFormat("avatar has no wearables");
MainConsole.Instance.Output("avatar has no wearables");
return;
}

15
OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs Normal file → Executable file
View File

@@ -122,7 +122,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
if (mainParams.Count != 4)
{
MainConsole.Instance.OutputFormat("Usage: friends show [--cache] <first-name> <last-name>");
MainConsole.Instance.Output("Usage: friends show [--cache] <first-name> <last-name>");
return;
}
@@ -136,7 +136,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
if (userId == UUID.Zero)
{
MainConsole.Instance.OutputFormat("No such user as {0} {1}", firstName, lastName);
MainConsole.Instance.Output("No such user as {0} {1}", null, firstName, lastName);
return;
}
@@ -146,7 +146,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
{
if (!m_friendsModule.AreFriendsCached(userId))
{
MainConsole.Instance.OutputFormat("No friends cached on this simulator for {0} {1}", firstName, lastName);
MainConsole.Instance.Output("No friends cached on this simulator for {0} {1}", null, firstName, lastName);
return;
}
else
@@ -162,10 +162,10 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
friends = ((FriendsModule)m_friendsModule).FriendsService.GetFriends(userId);
}
MainConsole.Instance.OutputFormat("Friends for {0} {1} {2}:", firstName, lastName, userId);
MainConsole.Instance.Output("Friends for {0} {1} {2}:", null, firstName, lastName, userId);
MainConsole.Instance.OutputFormat(
"{0,-36} {1,-36} {2,-7} {3,7} {4,10}", "UUID", "Name", "Status", "MyFlags", "TheirFlags");
MainConsole.Instance.Output(
"{0,-36} {1,-36} {2,-7} {3,7} {4,10}", null, "UUID", "Name", "Status", "MyFlags", "TheirFlags");
foreach (FriendInfo friend in friends)
{
@@ -191,8 +191,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
else
onlineText = "offline";
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"{0,-36} {1,-36} {2,-7} {3,-7} {4,-10}",
null,
friend.Friend, friendName, onlineText, friend.MyFlags, friend.TheirFlags);
}
}

8
OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs Normal file → Executable file
View File

@@ -142,8 +142,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
if (sitPart != null)
{
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Sitting {0} on {1} {2} in {3}",
null,
sp.Name, sitPart.ParentGroup.Name, sitPart.ParentGroup.UUID, m_scene.Name);
sp.HandleAgentRequestSit(sp.ControllingClient, sp.UUID, sitPart.UUID, Vector3.Zero);
@@ -151,8 +152,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
}
else
{
MainConsole.Instance.OutputFormat(
MainConsole.Instance.Output(
"Could not find any unoccupied set seat on which to sit {0} in {1}. Aborting",
null,
sp.Name, m_scene.Name);
break;
@@ -177,7 +179,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand
{
if (sp.SitGround || sp.IsSatOnObject)
{
MainConsole.Instance.OutputFormat("Standing {0} in {1}", sp.Name, m_scene.Name);
MainConsole.Instance.Output("Standing {0} in {1}", null, sp.Name, m_scene.Name);
sp.StandUp();
}
}

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsMessagingModule.cs Normal file → Executable file
View File

@@ -243,7 +243,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_debugEnabled = verbose;
MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled);
}
/// <summary>

2
OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs Normal file → Executable file
View File

@@ -154,7 +154,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
m_debugEnabled = verbose;
MainConsole.Instance.OutputFormat("{0} verbose logging set to {1}", Name, m_debugEnabled);
MainConsole.Instance.Output("{0} verbose logging set to {1}", null, Name, m_debugEnabled);
}
public void RegionLoaded(Scene scene)

4
OpenSim/Region/OptionalModules/PhysicsParameters/PhysicsParameters.cs
View File

@@ -256,13 +256,13 @@ namespace OpenSim.Region.OptionalModules.PhysicsParameters
private void WriteOut(string msg, params object[] args)
{
// m_log.InfoFormat(msg, args);
MainConsole.Instance.OutputFormat(msg, args);
MainConsole.Instance.Output(msg, null, args);
}
private void WriteError(string msg, params object[] args)
{
// m_log.ErrorFormat(msg, args);
MainConsole.Instance.OutputFormat(msg, args);
MainConsole.Instance.Output(msg, null, args);
}
}
}

2
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreCommands.cs Normal file → Executable file
View File

@@ -186,7 +186,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
return;
JsonStoreStats stats = m_store.GetStoreStats();
MainConsole.Instance.OutputFormat("{0}\t{1}",m_scene.RegionInfo.RegionName,stats.StoreCount);
MainConsole.Instance.Output("{0}\t{1}", null, m_scene.RegionInfo.RegionName, stats.StoreCount);
}
#endregion

4
OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs Normal file → Executable file
View File

@@ -109,7 +109,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
// This should always show up to the user but should not trigger warn/errors as these messages are
// expected and are not simulator problems. Ideally, there would be a status level in log4net but
// failing that, we will print out to console instead.
MainConsole.Instance.OutputFormat("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
MainConsole.Instance.Output("Region {0} - LOGINS DISABLED DURING INITIALIZATION.", null, m_scene.Name);
if (m_uri != string.Empty)
{
@@ -232,7 +232,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
// without info log messages enabled. Making this a warning is arguably misleading since it isn't a
// warning, and monitor scripts looking for warn/error/fatal messages will received false positives.
// Arguably, log4net needs a status log level (like Apache).
MainConsole.Instance.OutputFormat("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
MainConsole.Instance.Output("INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", null, m_scene.Name);
}
m_scene.SceneGridService.InformNeighborsThatRegionisUp(

6
OpenSim/Region/OptionalModules/World/AutoBackup/AutoBackupModule.cs Normal file → Executable file
View File

@@ -271,13 +271,13 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
if (args.Length != 2)
{
MainConsole.Instance.OutputFormat ("Usage: dooarbackup <regionname>");
MainConsole.Instance.Output("Usage: dooarbackup <regionname>");
return;
}
if(m_busy)
{
MainConsole.Instance.OutputFormat ("Already doing a backup, please try later");
MainConsole.Instance.Output("Already doing a backup, please try later");
return;
}
@@ -327,7 +327,7 @@ namespace OpenSim.Region.OptionalModules.World.AutoBackup
m_busy = false;
}
if (!found)
MainConsole.Instance.OutputFormat ("No such region {0}. Nothing to backup", name);
MainConsole.Instance.Output("No such region {0}. Nothing to backup", null, name);
}
private void ParseDefaultConfig(IConfig config)

4
OpenSim/Region/OptionalModules/World/SceneCommands/SceneCommandsModule.cs Normal file → Executable file
View File

@@ -145,7 +145,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
cdl.AddRow("teleport", m_scene.DebugTeleporting);
cdl.AddRow("updates", m_scene.DebugUpdates);
MainConsole.Instance.OutputFormat("Scene {0} options:", m_scene.Name);
MainConsole.Instance.Output("Scene {0} options:", null, m_scene.Name);
MainConsole.Instance.Output(cdl.ToString());
}
@@ -160,7 +160,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Attachments
string value = args[4];
SetSceneDebugOptions(new Dictionary<string, string>() { { key, value } });
MainConsole.Instance.OutputFormat("Set {0} debug scene {1} = {2}", m_scene.Name, key, value);
MainConsole.Instance.Output("Set {0} debug scene {1} = {2}", null, m_scene.Name, key, value);
}
else
{