From 2e02c1a239283f6b85f882059ac0cfe671576826 Mon Sep 17 00:00:00 2001 From: Dominion Date: Thu, 8 Jun 2023 03:45:36 -0400 Subject: [PATCH] Trace log these exceptions --- .../Controllers/ApiController.cs | 7 ++++++- .../Controllers/ConfigurationController.cs | 20 +++++++++---------- .../Controllers/HomeController.cs | 2 +- .../Controllers/UserController.cs | 4 ++-- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/Tgstation.Server.Host/Controllers/ApiController.cs b/src/Tgstation.Server.Host/Controllers/ApiController.cs index 6f03152921..46c9730b4c 100644 --- a/src/Tgstation.Server.Host/Controllers/ApiController.cs +++ b/src/Tgstation.Server.Host/Controllers/ApiController.cs @@ -219,8 +219,13 @@ namespace Tgstation.Server.Host.Controllers /// /// Generic 501 response. /// + /// The that was thrown. /// An with . - protected ObjectResult RequiresPosixSystemIdentity() => StatusCode(HttpStatusCode.NotImplemented, new ErrorMessageResponse(ErrorCode.RequiresPosixSystemIdentity)); + protected ObjectResult RequiresPosixSystemIdentity(NotImplementedException ex) + { + Logger.LogTrace(ex, "System identities not implemented!"); + return StatusCode(HttpStatusCode.NotImplemented, new ErrorMessageResponse(ErrorCode.RequiresPosixSystemIdentity)); + } /// /// Strongly type calls to . diff --git a/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs b/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs index d1ea19855c..b563293511 100644 --- a/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs +++ b/src/Tgstation.Server.Host/Controllers/ConfigurationController.cs @@ -97,9 +97,9 @@ namespace Tgstation.Server.Host.Controllers AdditionalData = e.Message, }); } - catch (NotImplementedException) + catch (NotImplementedException ex) { - return RequiresPosixSystemIdentity(); + return RequiresPosixSystemIdentity(ex); } } @@ -142,9 +142,9 @@ namespace Tgstation.Server.Host.Controllers AdditionalData = e.Message, }); } - catch (NotImplementedException) + catch (NotImplementedException ex) { - return RequiresPosixSystemIdentity(); + return RequiresPosixSystemIdentity(ex); } } @@ -188,10 +188,10 @@ namespace Tgstation.Server.Host.Controllers .AsQueryable() .OrderBy(x => x.Path)); } - catch (NotImplementedException) + catch (NotImplementedException ex) { return new PaginatableResult( - RequiresPosixSystemIdentity()); + RequiresPosixSystemIdentity(ex)); } catch (UnauthorizedAccessException) { @@ -262,9 +262,9 @@ namespace Tgstation.Server.Host.Controllers Message = e.Message, }); } - catch (NotImplementedException) + catch (NotImplementedException ex) { - return RequiresPosixSystemIdentity(); + return RequiresPosixSystemIdentity(ex); } catch (UnauthorizedAccessException) { @@ -302,9 +302,9 @@ namespace Tgstation.Server.Host.Controllers ? NoContent() : Conflict(new ErrorMessageResponse(ErrorCode.ConfigurationDirectoryNotEmpty))); } - catch (NotImplementedException) + catch (NotImplementedException ex) { - return RequiresPosixSystemIdentity(); + return RequiresPosixSystemIdentity(ex); } catch (UnauthorizedAccessException) { diff --git a/src/Tgstation.Server.Host/Controllers/HomeController.cs b/src/Tgstation.Server.Host/Controllers/HomeController.cs index ac9e666be8..0bce69891c 100644 --- a/src/Tgstation.Server.Host/Controllers/HomeController.cs +++ b/src/Tgstation.Server.Host/Controllers/HomeController.cs @@ -241,7 +241,7 @@ namespace Tgstation.Server.Host.Controllers } catch (NotImplementedException ex) { - Logger.LogTrace(ex, "System identities not implemented!"); + RequiresPosixSystemIdentity(ex); } using (systemIdentity) diff --git a/src/Tgstation.Server.Host/Controllers/UserController.cs b/src/Tgstation.Server.Host/Controllers/UserController.cs index f4cfd58898..c9c8a33714 100644 --- a/src/Tgstation.Server.Host/Controllers/UserController.cs +++ b/src/Tgstation.Server.Host/Controllers/UserController.cs @@ -127,9 +127,9 @@ namespace Tgstation.Server.Host.Controllers dbUser.Name = sysIdentity.Username; dbUser.SystemIdentifier = sysIdentity.Uid; } - catch (NotImplementedException) + catch (NotImplementedException ex) { - return RequiresPosixSystemIdentity(); + return RequiresPosixSystemIdentity(ex); } else if (!(model.Password?.Length == 0 && model.OAuthConnections?.Any() == true)) {