fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(health): add more info to health

Browse Source
This commit is contained in:
Steffen Jost 2023-07-12 08:21:31 +00:00
parent 9b93c00301
commit c596491e49
2 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Foundation/I18n.hs
View File

@ -247,7 +247,6 @@ mkMessageVariant ''UniWorX ''PWHashMessage "messages/auth/pw-hash" "de"
mkMessageVariant ''UniWorX ''ButtonMessage "messages/button" "de" mkMessageVariant ''UniWorX ''ButtonMessage "messages/button" "de"
mkMessageVariant ''UniWorX ''FrontendMessage "messages/frontend" "de-de-formal" mkMessageVariant ''UniWorX ''FrontendMessage "messages/frontend" "de-de-formal"
embedRenderMessage ''UniWorX ''HealthCheck id -- not possible here
embedRenderMessage ''UniWorX ''AvsLicence id -- required by UniWorXAvsMessages embedRenderMessage ''UniWorX ''AvsLicence id -- required by UniWorXAvsMessages
mkMessageAddition ''UniWorX "Qualification" "messages/uniworx/categories/qualification" "de-de-formal" mkMessageAddition ''UniWorX "Qualification" "messages/uniworx/categories/qualification" "de-de-formal"
mkMessageAddition ''UniWorX "Avs" "messages/uniworx/categories/avs" "de-de-formal" mkMessageAddition ''UniWorX "Avs" "messages/uniworx/categories/avs" "de-de-formal"
@ -317,6 +316,7 @@ appLanguagesOpts = do
langOptions = map mkOption $ toList appLanguages langOptions = map mkOption $ toList appLanguages
return $ mkOptionList langOptions return $ mkOptionList langOptions
embedRenderMessage ''UniWorX ''HealthCheck id
embedRenderMessage ''UniWorX ''MessageStatus ("Message" <>) embedRenderMessage ''UniWorX ''MessageStatus ("Message" <>)
embedRenderMessage ''UniWorX ''NotificationTrigger $ ("NotificationTrigger" <>) . concat . drop 1 . splitCamel embedRenderMessage ''UniWorX ''NotificationTrigger $ ("NotificationTrigger" <>) . concat . drop 1 . splitCamel
embedRenderMessage ''UniWorX ''StudyFieldType id embedRenderMessage ''UniWorX ''StudyFieldType id

27
src/Handler/Health.hs
View File

@ -6,7 +6,7 @@ module Handler.Health where
import Import import Import
-- import Handler.Utils import Handler.Utils.DateTime (formatTimeW)
import qualified Data.Aeson.Encode.Pretty as Aeson import qualified Data.Aeson.Encode.Pretty as Aeson
import qualified Data.Text.Lazy.Builder as Builder import qualified Data.Text.Lazy.Builder as Builder
@ -65,33 +65,22 @@ getHealthR = do
_{MsgMessageError} _{MsgMessageError}
<hr> <hr>
<dl .deflist> <dl .deflist>
$forall (_, report) <- healthReports' $forall (lUp, report) <- healthReports'
$with hcclass = classifyHealthReport report $with hcclass <- classifyHealthReport report
$with hcstatus = HealthSuccess == healthReportStatus report $with hcstatus <- HealthSuccess == healthReportStatus report
$case report $case report
$of HealthMatchingClusterConfig passed
<dt .deflist__dt>_{MsgHealthCheckMatchingClusterConfig}
<dd .deflist__dd>#{boolSymbol passed}
$of HealthHTTPReachable (Just passed)
<dt .deflist__dt>_{MsgHealthCheckHTTPReachable}
<dd .deflist__dd>#{boolSymbol passed}
$of HealthLDAPAdmins (Just found) $of HealthLDAPAdmins (Just found)
<dt .deflist__dt>_{MsgHealthCheckLDAPAdmins} <dt .deflist__dt>_{MsgHealthCheckLDAPAdmins}
<dd .deflist__dd>#{textPercent found 1} <dd .deflist__dd>#{textPercent found 1}
$of HealthSMTPConnect (Just passed) \ ^{formatTimeW SelFormatDateTime lUp}
<dt .deflist__dt>_{MsgHealthCheckSMTPConnect}
<dd .deflist__dd>#{boolSymbol passed}
$of HealthWidgetMemcached (Just passed)
<dt .deflist__dt>_{MsgHealthCheckWidgetMemcached}
<dd .deflist__dd>#{boolSymbol passed}
$of HealthActiveJobExecutors (Just active) $of HealthActiveJobExecutors (Just active)
<dt .deflist__dt>_{MsgHealthCheckActiveJobExecutors} <dt .deflist__dt>_{MsgHealthCheckActiveJobExecutors}
<dd .deflist__dd>#{textPercent active 1} <dd .deflist__dd>#{textPercent active 1}
$of HealthDoesFlush mProp \ ^{formatTimeW SelFormatDateTime lUp}
$of _
<dt .deflist__dt>_{hcclass} <dt .deflist__dt>_{hcclass}
<dd .deflist__dd>#{boolSymbol hcstatus} <dd .deflist__dd>#{boolSymbol hcstatus}
$of _ \ ^{formatTimeW SelFormatDateTime lUp}
|] |]
provideJson healthReports provideJson healthReports
provideRep . return . Builder.toLazyText $ Aeson.encodePrettyToTextBuilder healthReports provideRep . return . Builder.toLazyText $ Aeson.encodePrettyToTextBuilder healthReports