From 23e6cebfbac335119a0e2e8c7e654763f57278a7 Mon Sep 17 00:00:00 2001 From: Zachary Seguin Date: Wed, 21 Jun 2017 18:52:10 -0400 Subject: [PATCH] pub is not a project --- nginx.go | 2 +- project.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.go b/nginx.go index 0b387ac..72b6d9d 100644 --- a/nginx.go +++ b/nginx.go @@ -57,7 +57,7 @@ func (e *NginxExporter) Collect(ch chan<- prometheus.Metric) { e.error_responses.Collect(ch) } -var nginxProjectRe = regexp.MustCompile("(?i)^\\w+ /([^/?]+)/[^\\s]* HTTP") +var nginxProjectRe = regexp.MustCompile("(?i)^\\w+ /(?:pub/)?([^/?]+)/[^\\s]* HTTP") func (e *NginxExporter) processLogLine(line string) { lineReader := strings.NewReader(line) diff --git a/project.go b/project.go index 36252bd..321de62 100644 --- a/project.go +++ b/project.go @@ -7,7 +7,7 @@ import ( func IsMirroredProject(project string) bool { if _, err := os.Stat(fmt.Sprintf("/mirror/root/%s", project)); err == nil { - return true + return project != "pub" } else { return false }