Mirrors/go-inbucket
1
0
Fork 0
mirror of https://github.com/jhillyerd/inbucket.git synced 2025-12-18 18:17:03 +00:00
Code Issues Releases Wiki Activity

Display message cap on status page

Browse Source
This commit is contained in:
James Hillyerd
2016-03-06 10:15:10 -08:00
parent e99baf766b
commit 3481a89533
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased] ## [Unreleased]
### Fixed ### Fixed
- Shutdown hang in retention scanner - Shutdown hang in retention scanner
- Add Message Cap to status page
## [1.1.0-rc1] - 2016-03-04 ## [1.1.0-rc1] - 2016-03-04
### Added ### Added

20
themes/bootstrap/templates/root/status.html
View File

@@ -54,7 +54,17 @@ $(document).ready(
<div class="row"> <div class="row">
<div class="col-sm-3 col-xs-7"><b>No-Store Domain:</b></div> <div class="col-sm-3 col-xs-7"><b>No-Store Domain:</b></div>
<div class="col-sm-8 col-xs-5"> <div class="col-sm-8 col-xs-5">
<span>{{ or .noStoreDomain .noStoreDomain "Not Configured"}}</span> {{with .smtpConfig}}
<span>{{or .DomainNoStore .DomainNoStore "Not Configured"}}</span>
{{end}}
</div>
</div>
<div class="row">
<div class="col-sm-3 col-xs-7"><b>Message Cap:</b></div>
<div class="col-sm-8 col-xs-5">
{{with .dataStoreConfig}}
<span>{{.MailboxMsgCap}} messages per mailbox</span>
{{end}}
</div> </div>
</div> </div>
</table> </table>
@@ -151,8 +161,8 @@ $(document).ready(
<table class="metrics"> <table class="metrics">
<div class="row"> <div class="row">
<div class="col-sm-3 col-xs-7"><b>Retention Period:</b></div> <div class="col-sm-3 col-xs-7"><b>Retention Period:</b></div>
<div class="col-sm-3 col-xs-5"> <div class="col-sm-8 col-xs-5">
{{if .retentionMinutes}} {{if .dataStoreConfig.RetentionMinutes}}
<span id="m-retentionPeriod">.</span> <span id="m-retentionPeriod">.</span>
{{else}} {{else}}
Disabled Disabled
@@ -161,8 +171,8 @@ $(document).ready(
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-3 col-xs-7"><b>Retention Scan:</b></div> <div class="col-sm-3 col-xs-7"><b>Retention Scan:</b></div>
<div class="col-sm-3 col-xs-5"> <div class="col-sm-8 col-xs-5">
{{if .retentionMinutes}} {{if .dataStoreConfig.RetentionMinutes}}
Completed <span id="m-retentionScanCompleted">.</span> ago Completed <span id="m-retentionScanCompleted">.</span> ago
{{else}} {{else}}
Disabled Disabled

16
webui/root_controller.go
View File

@@ -32,13 +32,13 @@ func RootStatus(w http.ResponseWriter, req *http.Request, ctx *httpd.Context) (e
webListener := fmt.Sprintf("%s:%d", config.GetWebConfig().IP4address.String(), webListener := fmt.Sprintf("%s:%d", config.GetWebConfig().IP4address.String(),
config.GetWebConfig().IP4port) config.GetWebConfig().IP4port)
return httpd.RenderTemplate("root/status.html", w, map[string]interface{}{ return httpd.RenderTemplate("root/status.html", w, map[string]interface{}{
"ctx": ctx, "ctx": ctx,
"version": config.Version, "version": config.Version,
"buildDate": config.BuildDate, "buildDate": config.BuildDate,
"retentionMinutes": config.GetDataStoreConfig().RetentionMinutes, "smtpListener": smtpListener,
"smtpListener": smtpListener, "pop3Listener": pop3Listener,
"pop3Listener": pop3Listener, "webListener": webListener,
"webListener": webListener, "smtpConfig": config.GetSMTPConfig(),
"noStoreDomain": config.GetSMTPConfig().DomainNoStore, "dataStoreConfig": config.GetDataStoreConfig(),
}) })
} }