From d7714530a893c6ff47fc84ab7b23f0343fffef9d Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Wed, 24 May 2023 14:16:43 +0100 Subject: [PATCH] try to reduce log spam on http fails --- .../InstantMessage/MessageTransferModule.cs | 2 +- .../UserManagement/UserManagementModule.cs | 8 +++--- .../Connectors/Estate/EstateDataConnector.cs | 28 +++++++++---------- .../InstantMessageServiceConnector.cs | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 0a39aeb710..558ef4cdb3 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs @@ -617,7 +617,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage return false; } } - catch (WebException e) + catch (Exception e) { m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0} : {1}", reginfo.ServerURI.ToString(), e.Message); } diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs index daad6741e9..cfaa1f6dde 100755 --- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs +++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs @@ -849,7 +849,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement { userdata.ServerURLs = uConn.GetServerURLs(userID); } - catch(System.Net.WebException e) + catch (System.Net.Http.HttpRequestException e) { m_log.DebugFormat("[USER MANAGEMENT MODULE]: GetServerURLs call failed {0}", e.Message); WebUtil.GlobalExpiringBadURLs.Add(homeuri, BADURLEXPIRE * 1000); @@ -857,7 +857,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement } catch (Exception e) { - m_log.Debug("[USER MANAGEMENT MODULE]: GetServerURLs call failed ", e); + m_log.Debug($"[USER MANAGEMENT MODULE]: GetServerURLs call failed {e.Message}"); userdata.ServerURLs = new Dictionary(); } @@ -919,7 +919,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement { userdata.ServerURLs = uConn.GetServerURLs(userID); } - catch (System.Net.WebException e) + catch (System.Net.Http.HttpRequestException e) { m_log.DebugFormat("[USER MANAGEMENT MODULE]: GetServerURLs call failed {0}", e.Message); userdata.ServerURLs = new Dictionary(); @@ -929,7 +929,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement } catch (Exception e) { - m_log.Debug("[USER MANAGEMENT MODULE]: GetServerURLs call failed ", e); + m_log.Debug($"[USER MANAGEMENT MODULE]: GetServerURLs call failed {e.Message}"); userdata.ServerURLs = new Dictionary(); userdata.LastWebFail = Util.GetTimeStamp(); recentFail = true; diff --git a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs index 310ceae52c..3aa6b22416 100644 --- a/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs +++ b/OpenSim/Services/Connectors/Estate/EstateDataConnector.cs @@ -39,6 +39,7 @@ using OpenSim.Framework.ServiceAuth; using OpenSim.Services.Connectors; using OpenSim.Services.Interfaces; using OpenSim.Server.Base; +using System.Net.Http; namespace OpenSim.Services.Connectors { @@ -319,25 +320,24 @@ namespace OpenSim.Services.Connectors reply = SynchronousRestFormsRequester.MakeRequest(verb, uri, formdata, 30, m_Auth); return reply; } - catch (WebException e) + catch (HttpRequestException e) { - using (HttpWebResponse hwr = (HttpWebResponse)e.Response) + if (e.StatusCode is HttpStatusCode status) { - if (hwr != null) + if (status == HttpStatusCode.Unauthorized) { - if (hwr.StatusCode == HttpStatusCode.NotFound) - { - m_log.Error(string.Format("[ESTATE CONNECTOR]: Resource {0} not found ", uri)); - return reply; - } - if (hwr.StatusCode == HttpStatusCode.Unauthorized) - m_log.Error(string.Format("[ESTATE CONNECTOR]: Web request {0} requires authentication ", uri)); + m_log.Error(string.Format("[ESTATE CONNECTOR]: Web request {0} requires authentication ", uri)); + } + else if (status != HttpStatusCode.NotFound) + { + m_log.Error(string.Format("[ESTATE CONNECTOR]: Resource {0} not found ", uri)); + return reply; } - else - m_log.Error(string.Format( - "[ESTATE CONNECTOR]: WebException for {0} {1} {2} {3}", - verb, uri, formdata, e.Message)); } + else + m_log.Error(string.Format( + "[ESTATE CONNECTOR]: WebException for {0} {1} {2} {3}", + verb, uri, formdata, e.Message)); } catch (Exception e) { diff --git a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs index c5a2d5e816..58a16ed36f 100644 --- a/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs +++ b/OpenSim/Services/Connectors/InstantMessage/InstantMessageServiceConnector.cs @@ -84,7 +84,7 @@ namespace OpenSim.Services.Connectors.InstantMessage return false; } } - catch (WebException e) + catch (Exception e) { m_log.ErrorFormat("[GRID INSTANT MESSAGE]: Error sending message to {0} : {1}", url, e.Message); }