From 0fa5ff0ec03e5dfd6ebdd9af2268e0c33796368d Mon Sep 17 00:00:00 2001 From: onefang Date: Wed, 9 Sep 2020 04:33:43 +1000 Subject: Various logging fix ups. Mostly removing console spam. Swap a bunch of info / debug logs. Better archiver console spam. Have some "avatar has left" mesasge hit the INFO console. Tweak the login logging a bit, especially for impersonations. Default to INFO on the console and DEBUG in the log files. More time stamp resolution. Better sim startup console notification. Attempt to render "[LLUDPSERVER]: Malformed data, cannot parse" into something human readable as an aid to diagnosis. Beats hand translating the big block of hex codes it was spewing. Better sim startup finished messages. Inform neighbours we are up before the finished messages. Always send the "[RegionReady]: INITIALIZATION COMPLETE FOR" message. --- .../Region/ClientStack/Linden/UDP/LLUDPServer.cs | 7 +++++-- .../Archiver/InventoryArchiveWriteRequest.cs | 24 ++++++++-------------- .../World/Archiver/ArchiveWriteRequest.cs | 16 +++++++-------- .../CoreModules/World/Archiver/AssetsArchiver.cs | 5 ----- .../CoreModules/World/Terrain/TerrainModule.cs | 6 +++--- .../Region/CoreModules/World/Wind/WindModule.cs | 4 ++-- OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 +++--- OpenSim/Region/Framework/Scenes/Scene.cs | 10 ++++----- .../Framework/Scenes/SceneCommunicationService.cs | 4 ++-- .../CoalescedSceneObjectsSerializer.cs | 7 ++++--- .../Scenes/Serialization/SceneObjectSerializer.cs | 14 +++++++------ OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 23 +++++++++++++-------- .../RegionReadyModule/RegionReadyModule.cs | 5 +++-- OpenSim/Server/ServerMain.cs | 2 +- .../PasswordAuthenticationService.cs | 10 ++++++--- OpenSim/Services/FSAssetService/FSAssetService.cs | 3 ++- OpenSim/Services/GridService/GridService.cs | 4 ++-- .../Services/PresenceService/PresenceService.cs | 4 ++-- 18 files changed, 80 insertions(+), 74 deletions(-) mode change 100755 => 100644 OpenSim/Services/GridService/GridService.cs diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 6994efb..c3ee6ab 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs @@ -33,6 +33,8 @@ using System.IO; using System.Net; using System.Net.Sockets; using System.Reflection; +using System.Text; +using System.Text.RegularExpressions; using System.Threading; using log4net; using Nini.Config; @@ -1319,8 +1321,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP { if (IncomingMalformedPacketCount < 100) { - m_log.WarnFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}, data {2}:", - buffer.DataLength, buffer.RemoteEndPoint, Utils.BytesToHexString(buffer.Data, buffer.DataLength, null)); + m_log.WarnFormat("[LLUDPSERVER]: Malformed data, cannot parse {0} byte packet from {1}, data as hex {2}: {3}", + buffer.DataLength, buffer.RemoteEndPoint, Utils.BytesToHexString(buffer.Data, buffer.DataLength, null), + Regex.Replace(Encoding.UTF8.GetString(buffer.Data, 0, buffer.DataLength), @"\p{Cc}", a=>string.Format("[{0:X2}]", (byte)a.Value[0]))); } RecordMalformedInboundPacket(endPoint); diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index ad46107..520ea50 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs @@ -231,24 +231,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if(curErrorCntr > 0 || possible > 0) { - string spath; - int indx = path.IndexOf("__"); - if(indx > 0) - spath = path.Substring(0,indx); - else - spath = path; - if(curErrorCntr > 0) { - m_log.ErrorFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets", - inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, curErrorCntr); - if(possible > 0) - m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible); - } - else if(possible > 0) - { - m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references that may be to missing or damaged assets or not a problem", inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, possible); + // path is /name__UUID/name__UUID ... + m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references to missing or damaged assets, or not a problem.", + inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), path, curErrorCntr); +//// if(possible > 0) +//// m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item also contains {0} references that may be to missing or damaged assets or not a problem", possible); } +//// else if(possible > 0) +//// { +//// m_log.WarnFormat("[INVENTORY ARCHIVER Warning]: item {0} '{1}', type {2}, in '{3}', contains {4} references that may be to missing or damaged assets or not a problem", inventoryItem.ID, inventoryItem.Name, itemAssetType.ToString(), spath, possible); +//// } } } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs index 060e753..6b8755b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs @@ -275,16 +275,16 @@ namespace OpenSim.Region.CoreModules.World.Archiver possible = assetGatherer.possibleNotAssetCount - possible; if(curErrorCntr > 0) { - m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets", + m_log.ErrorFormat("[ARCHIVER]: object {0} '{1}', at {2}, contains {3} references to missing or damaged assets, or not a problem.", sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), curErrorCntr); - if(possible > 0) - m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible); - } - else if(possible > 0) - { - m_log.WarnFormat("[ARCHIVER Warning]: object {0} '{1}', at {2}, contains {3} references that may be to missing or damaged assets or not a problem", - sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible); +//// if(possible > 0) +//// m_log.WarnFormat("[ARCHIVER Warning]: object also contains {0} references that may be to missing or damaged assets or not a problem", possible); } +//// else if(possible > 0) +//// { +//// m_log.WarnFormat("[ARCHIVER Warning]: object {0} '{1}', at {2}, contains {3} references that may be to missing or damaged assets or not a problem", +//// sceneObject.UUID, sceneObject.Name ,sceneObject.AbsolutePosition.ToString(), possible); +//// } } assetGatherer.GatherAll(); diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 3092fe0..0a955c5 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs @@ -143,11 +143,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver asset.Data); m_assetsWritten++; - - //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten); - - if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0) - m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten); } } diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index f29011e..b5b925f 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs @@ -664,7 +664,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain { ITerrainLoader terLoader = (ITerrainLoader)Activator.CreateInstance(library.GetType(pluginType.ToString())); m_loaders[terLoader.FileExtension] = terLoader; - m_log.Info("L ... " + typeName); + m_log.Debug("L ... " + typeName); } } catch(AmbiguousMatchException) @@ -680,12 +680,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain if (!m_plugineffects.ContainsKey(pluginName)) { m_plugineffects.Add(pluginName, effect); - m_log.Info("E ... " + pluginName); + m_log.Debug("E ... " + pluginName); } else { m_plugineffects[pluginName] = effect; - m_log.Info("E ... " + pluginName + " (Replaced)"); + m_log.Debug("E ... " + pluginName + " (Replaced)"); } } } diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index 51faa0e..183b985 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs @@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules // Register all the Wind Model Plug-ins foreach (IWindModelPlugin windPlugin in AddinManager.GetExtensionObjects("/OpenSim/WindModule", false)) { - m_log.InfoFormat("[WIND] Found Plugin: {0}", windPlugin.Name); + m_log.DebugFormat("[WIND] Found Plugin: {0}", windPlugin.Name); m_availableWindPlugins.Add(windPlugin.Name, windPlugin); } @@ -109,7 +109,7 @@ namespace OpenSim.Region.CoreModules { m_activeWindPlugin = m_availableWindPlugins[m_dWindPluginName]; - m_log.InfoFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName); + m_log.DebugFormat("[WIND] {0} plugin found, initializing.", m_dWindPluginName); if (m_windConfig != null) { diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index debcad3..4185813 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs @@ -1691,9 +1691,9 @@ namespace OpenSim.Region.Framework.Scenes UUID copyID = UUID.Random(); bool modrights = Permissions.CanEditObject(part.ParentGroup, remoteClient); part.ParentGroup.AddInventoryItem(remoteClient.AgentId, primLocalID, item, copyID, modrights); - m_log.InfoFormat( - "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", - item.Name, primLocalID, remoteClient.Name); +//// m_log.InfoFormat( +//// "[PRIM INVENTORY]: Update with item {0} requested of prim {1} for {2}", +//// item.Name, primLocalID, remoteClient.Name); part.SendPropertiesToClient(remoteClient); if (!Permissions.BypassPermissions()) { diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0c5007a..5f1497a 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -1770,15 +1770,15 @@ namespace OpenSim.Region.Framework.Scenes GC.Collect(); if (!LoginLock) { + m_sceneGridService.InformNeighborsThatRegionisUp( + RequestModuleInterface(), RegionInfo); + if (!StartDisabled) { m_log.InfoFormat("[REGION]: Enabling logins for {0}", RegionInfo.RegionName); LoginsEnabled = true; } - m_sceneGridService.InformNeighborsThatRegionisUp( - RequestModuleInterface(), RegionInfo); - // Region ready should always be set Ready = true; @@ -1805,7 +1805,7 @@ namespace OpenSim.Region.Framework.Scenes } } } - else +//// else { // This handles a case of a region having no scripts for the RegionReady module if (m_sceneGraph.GetActiveScriptsCount() == 0) @@ -3716,7 +3716,7 @@ namespace OpenSim.Region.Framework.Scenes { isChildAgent = avatar.IsChildAgent; - m_log.DebugFormat( + m_log.InfoFormat( "[SCENE]: Removing {0} agent {1} {2} from {3}", isChildAgent ? "child" : "root", avatar.Name, agentID, Name); diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index c89a123..fdfa1e9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs @@ -88,7 +88,7 @@ namespace OpenSim.Region.Framework.Scenes if (neighbour != null) { - m_log.DebugFormat("{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up", + m_log.InfoFormat("{0} Region {1} successfully informed neighbour {2} at {3}-{4} that it is up", LogHeader, m_scene.Name, neighbour.RegionName, Util.WorldToRegionLoc(x), Util.WorldToRegionLoc(y)); m_scene.EventManager.TriggerOnRegionUp(neighbour); @@ -131,7 +131,7 @@ namespace OpenSim.Region.Framework.Scenes } } - m_log.DebugFormat( + m_log.InfoFormat( "{0} Informing {1} neighbours that region {2} is up", LogHeader, onlineNeighbours.Count, m_scene.Name); diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs index 41f3ef4..5302e8b 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs @@ -176,10 +176,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization i++; } } - catch (Exception e) + catch /*(Exception e)*/ { - m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); - Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); + m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); +//// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); +//// Util.LogFailedXML("[COALESCED SCENE OBJECTS SERIALIZER]:", xml); return false; } diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index ae8f6f6..d9a1f93 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs @@ -69,10 +69,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization { return FromOriginalXmlFormat(reader); } - catch (Exception e) + catch /*(Exception e)*/ { - m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); - Util.LogFailedXML("[SERIALIZER]:", fixedData); + m_log.Error("[SERIALIZER]: Deserialization of xml failed "); +//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); +//// Util.LogFailedXML("[SERIALIZER]:", fixedData); return null; } } @@ -307,10 +308,11 @@ namespace OpenSim.Region.Framework.Scenes.Serialization // sceneObject.AggregatePerms(); return sceneObject; } - catch (Exception e) + catch /*(Exception e)*/ { - m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); - Util.LogFailedXML("[SERIALIZER]:", xmlData); + m_log.Error("[SERIALIZER]: Deserialization of xml failed "); +//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); +//// Util.LogFailedXML("[SERIALIZER]:", xmlData); return null; } } diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index d0c48b7..88a93b5 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs @@ -573,18 +573,23 @@ namespace OpenSim.Region.Framework.Scenes { string xml = Utils.BytesToString(sceneObjectAsset.Data); - CoalescedSceneObjects coa; - if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) - { - foreach (SceneObjectGroup sog in coa.Objects) - AddForInspection(sog); - } + if (String.IsNullOrEmpty(xml)) + m_log.ErrorFormat("[UUIDGatherer]: Asset {0} - {1} has a zero length XML blob!", sceneObjectAsset.Name, sceneObjectAsset.ID); else { - SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); + CoalescedSceneObjects coa; + if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) + { + foreach (SceneObjectGroup sog in coa.Objects) + AddForInspection(sog); + } + else + { + SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); - if (null != sog) - AddForInspection(sog); + if (null != sog) + AddForInspection(sog); + } } } diff --git a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs index 988ada1..135901a 100644 --- a/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs +++ b/OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs @@ -239,8 +239,9 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady m_log.InfoFormat("[RegionReady]: INITIALIZATION COMPLETE FOR {0}", m_scene.Name); } - m_scene.SceneGridService.InformNeighborsThatRegionisUp( - m_scene.RequestModuleInterface(), m_scene.RegionInfo); +//// Scene.cs already does this. +//// m_scene.SceneGridService.InformNeighborsThatRegionisUp( +//// m_scene.RequestModuleInterface(), m_scene.RegionInfo); if (m_uri != string.Empty) { diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index f1a7c97..c42e254 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs @@ -180,7 +180,7 @@ namespace OpenSim.Server if (connector != null) { m_ServiceConnectors.Add(connector); - m_log.InfoFormat("[SERVER]: {0} loaded successfully", friendlyName); +//// m_log.InfoFormat("[SERVER]: {0} loaded successfully", friendlyName); } else { diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs index 0204699..aef3e9f 100644 --- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs +++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs @@ -87,6 +87,7 @@ namespace OpenSim.Services.AuthenticationService if (!data.Data.ContainsKey("passwordHash") || !data.Data.ContainsKey("passwordSalt")) { + m_log.DebugFormat("[AUTH SERVICE]: No credentials."); return String.Empty; } @@ -109,9 +110,12 @@ namespace OpenSim.Services.AuthenticationService int impersonateFlag = 1 << 6; if ((user.UserFlags & impersonateFlag) == 0) + { + m_log.DebugFormat("[AUTH SERVICE]: Not trying impersonation {0} {1}.", user.UserFlags, impersonateFlag); return String.Empty; + } - m_log.DebugFormat("[PASS AUTH]: Attempting impersonation"); + m_log.DebugFormat("[PASS AUTH]: Attempting impersonation."); List accounts = m_UserAccountService.GetUserAccountsWhere(UUID.Zero, "UserLevel >= 200"); if (accounts == null || accounts.Count == 0) @@ -134,7 +138,7 @@ namespace OpenSim.Services.AuthenticationService if (data.Data["passwordHash"].ToString() == hashed) { - m_log.DebugFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); + m_log.InfoFormat("[PASS AUTH]: {0} {1} impersonating {2}, proceeding with login", a.FirstName, a.LastName, principalID); realID = a.PrincipalID; return GetToken(principalID, lifetime); } @@ -146,7 +150,7 @@ namespace OpenSim.Services.AuthenticationService // } } - m_log.DebugFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); + m_log.InfoFormat("[PASS AUTH]: Impersonation of {0} failed", principalID); return String.Empty; } } diff --git a/OpenSim/Services/FSAssetService/FSAssetService.cs b/OpenSim/Services/FSAssetService/FSAssetService.cs index 2fb3e6c..d1a59d1 100644 --- a/OpenSim/Services/FSAssetService/FSAssetService.cs +++ b/OpenSim/Services/FSAssetService/FSAssetService.cs @@ -178,6 +178,7 @@ namespace OpenSim.Services.FSAssetService Directory.CreateDirectory(spoolTmp); m_FSBase = assetConfig.GetString("BaseDirectory", String.Empty); + m_log.InfoFormat("[FSASSETS]: Assets base and spool directory are {0} and {1}", m_FSBase, m_SpoolDirectory); if (m_FSBase == String.Empty) { m_log.ErrorFormat("[FSASSETS]: BaseDirectory not specified"); @@ -230,7 +231,7 @@ namespace OpenSim.Services.FSAssetService double avg = (double)m_readTicks / (double)m_readCount; // if (avg > 10000) // Environment.Exit(0); - m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS); +//// m_log.InfoFormat("[FSASSETS]: Read stats: {0} files, {1} ticks, avg {2:F2}, missing {3}, FS {4}", m_readCount, m_readTicks, (double)m_readTicks / (double)m_readCount, m_missingAssets, m_missingAssetsFS); } m_readCount = 0; m_readTicks = 0; diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs old mode 100755 new mode 100644 index d8f3720..b42cfb1 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs @@ -345,7 +345,7 @@ namespace OpenSim.Services.GridService m_log.DebugFormat("[GRID SERVICE]: Database exception: {0}", e); } - m_log.DebugFormat + m_log.InfoFormat ("[GRID SERVICE]: Region {0} ({1}, {2}x{3}) registered at {4},{5} with flags {6}", regionInfos.RegionName, regionInfos.RegionID, regionInfos.RegionSizeX, regionInfos.RegionSizeY, regionInfos.RegionCoordX, regionInfos.RegionCoordY, @@ -374,7 +374,7 @@ namespace OpenSim.Services.GridService if (region == null) return false; - m_log.DebugFormat( + m_log.InfoFormat( "[GRID SERVICE]: Deregistering region {0} ({1}) at {2}-{3}", region.RegionName, region.RegionID, region.coordX, region.coordY); diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index ae92919..1539d5b 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs @@ -88,7 +88,7 @@ namespace OpenSim.Services.PresenceService { PresenceInfo presence = GetAgent(sessionID); - m_log.DebugFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}", + m_log.InfoFormat("[PRESENCE SERVICE]: LogoutAgent: session {0}, user {1}, region {2}", sessionID, (presence == null) ? null : presence.UserID, (presence == null) ? null : presence.RegionID.ToString()); @@ -198,4 +198,4 @@ namespace OpenSim.Services.PresenceService } } -} \ No newline at end of file +} -- cgit v1.1