From 2dd1271cce6f256474c00b4c9a8da2d68978a618 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 18 Dec 2018 00:19:05 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/ApiRootController.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/AyaNova/Controllers/ApiRootController.cs b/server/AyaNova/Controllers/ApiRootController.cs index bcb9919e..ec15b165 100644 --- a/server/AyaNova/Controllers/ApiRootController.cs +++ b/server/AyaNova/Controllers/ApiRootController.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging; using System; using AyaNova.Util; using AyaNova.Biz; +using AyaNova.Api.ControllerHelpers; namespace AyaNova.Api.Controllers { @@ -13,16 +14,18 @@ namespace AyaNova.Api.Controllers [Route("api/v{version:apiVersion}/")] public class ApiMetaController : Controller { - + private readonly ApiServerState serverState; private readonly ILogger _log; /// /// /// /// - public ApiMetaController(ILogger logger) + /// + public ApiMetaController(ILogger logger, ApiServerState apiServerState) { _log = logger; + serverState = apiServerState; } /// @@ -32,15 +35,21 @@ namespace AyaNova.Api.Controllers [HttpGet] public ContentResult Index() { + var errorBlock = string.Empty; + if (serverState.IsSystemLocked){ + errorBlock=$@"

SERVER ERROR

{serverState.Reason}

"; + } - var resp = $@" + var resp = $@" AyaNova server +
+ {errorBlock}

{AyaNovaVersion.FullNameAndVersion}

AyaNova App

@@ -58,7 +67,7 @@ namespace AyaNova.Api.Controllers 
{TimeZoneInfo.Local.Id}

Server logs

{ServerBootConfig.AYANOVA_LOG_PATH}
-
+
";