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

Metrics: rename Delivered to Received, closes #10

Browse Source
This commit is contained in:
James Hillyerd
2012-11-14 17:36:39 -08:00
parent afe14da506
commit cabc5f0d2b
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
smtpd/handler.go
View File

@@ -340,11 +340,11 @@ func (ss *Session) dataHandler() {
for _, m := range messages {
if m != nil {
m.Close()
expDeliveredTotal.Add(1)
expReceivedTotal.Add(1)
}
}
} else {
expDeliveredTotal.Add(1)
expReceivedTotal.Add(1)
}
ss.send("250 Mail accepted for delivery")
ss.info("Message size %v bytes", msgSize)

10
smtpd/listener.go
View File

@@ -25,7 +25,7 @@ type Server struct {
// Raw stat collectors
var expConnectsTotal = new(expvar.Int)
var expConnectsCurrent = new(expvar.Int)
var expDeliveredTotal = new(expvar.Int)
var expReceivedTotal = new(expvar.Int)
var expErrorsTotal = new(expvar.Int)
var expWarnsTotal = new(expvar.Int)
@@ -36,7 +36,7 @@ var errorsHist = list.New()
var warnsHist = list.New()
// History rendered as comma delim string
var expDeliveredHist = new(expvar.String)
var expReceivedHist = new(expvar.String)
var expConnectsHist = new(expvar.String)
var expErrorsHist = new(expvar.String)
var expWarnsHist = new(expvar.String)
@@ -96,7 +96,7 @@ func metricsTicker(t *time.Ticker) {
ok := true
for ok {
_, ok = <-t.C
expDeliveredHist.Set(pushMetric(deliveredHist, expDeliveredTotal))
expReceivedHist.Set(pushMetric(deliveredHist, expReceivedTotal))
expConnectsHist.Set(pushMetric(connectsHist, expConnectsTotal))
expErrorsHist.Set(pushMetric(errorsHist, expErrorsTotal))
expWarnsHist.Set(pushMetric(warnsHist, expWarnsTotal))
@@ -120,8 +120,8 @@ func init() {
m.Set("ConnectsTotal", expConnectsTotal)
m.Set("ConnectsHist", expConnectsHist)
m.Set("ConnectsCurrent", expConnectsCurrent)
m.Set("DeliveredTotal", expDeliveredTotal)
m.Set("DeliveredHist", expDeliveredHist)
m.Set("ReceivedTotal", expReceivedTotal)
m.Set("ReceivedHist", expReceivedHist)
m.Set("ErrorsTotal", expErrorsTotal)
m.Set("ErrorsHist", expErrorsHist)
m.Set("WarnsTotal", expWarnsTotal)

10
themes/integral/templates/root/status.html
View File

@@ -100,8 +100,8 @@
metric('smtpConnectsCurrent', data.smtp.ConnectsCurrent, numberFilter, true)
// Server-side history
metric('smtpDeliveredTotal', data.smtp.DeliveredTotal, numberFilter, false)
setHistory('smtpDeliveredTotal', data.smtp.DeliveredHist)
metric('smtpReceivedTotal', data.smtp.ReceivedTotal, numberFilter, false)
setHistory('smtpReceivedTotal', data.smtp.ReceivedHist)
metric('smtpConnectsTotal', data.smtp.ConnectsTotal, numberFilter, false)
setHistory('smtpConnectsTotal', data.smtp.ConnectsHist)
metric('smtpWarnsTotal', data.smtp.WarnsTotal, numberFilter, false)
@@ -189,9 +189,9 @@
<td>(60min)</td>
</tr>
<tr>
<th>Messages Delivered:</th>
<td><span id="m-smtpDeliveredTotal">.</span></td>
<td class="sparkline"><span id="s-smtpDeliveredTotal">.</span></td>
<th>Messages Received:</th>
<td><span id="m-smtpReceivedTotal">.</span></td>
<td class="sparkline"><span id="s-smtpReceivedTotal">.</span></td>
<td>(60min)</td>
</tr>
<tr>