locker98/postfix_exporter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #54 from k-kinzal/fixes-panic-logfilepath-empty

Browse Source 
fixes panic appears when tailer is nil
This commit is contained in:
Bart Vercoulen 2020-06-30 15:10:33 +02:00 committed by GitHub
commit 8e63fbbe8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
postfix_exporter.go
View File

@ -612,6 +612,9 @@ func NewPostfixExporter(showqPath string, logfilePath string, journal *Journal,
func (e *PostfixExporter) Describe(ch chan<- *prometheus.Desc) { func (e *PostfixExporter) Describe(ch chan<- *prometheus.Desc) {
ch <- postfixUpDesc ch <- postfixUpDesc
if e.tailer == nil {
return
}
ch <- e.cleanupProcesses.Desc() ch <- e.cleanupProcesses.Desc()
ch <- e.cleanupRejects.Desc() ch <- e.cleanupRejects.Desc()
ch <- e.cleanupNotAccepted.Desc() ch <- e.cleanupNotAccepted.Desc()
@ -664,7 +667,7 @@ func (e *PostfixExporter) foreverCollectFromJournal(ctx context.Context) {
func (e *PostfixExporter) StartMetricCollection(ctx context.Context) { func (e *PostfixExporter) StartMetricCollection(ctx context.Context) {
if e.journal != nil { if e.journal != nil {
e.foreverCollectFromJournal(ctx) e.foreverCollectFromJournal(ctx)
} else { } else if e.tailer != nil {
e.CollectLogfileFromFile(ctx) e.CollectLogfileFromFile(ctx)
} }
@ -697,6 +700,9 @@ func (e *PostfixExporter) Collect(ch chan<- prometheus.Metric) {
e.showqPath) e.showqPath)
} }
if e.tailer == nil {
return
}
ch <- e.cleanupProcesses ch <- e.cleanupProcesses
ch <- e.cleanupRejects ch <- e.cleanupRejects
ch <- e.cleanupNotAccepted ch <- e.cleanupNotAccepted