diff --git a/go.mod b/go.mod index 6934c87..d8bfcbe 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/emvi/api-go v0.2.2 github.com/emvi/logbuch v1.1.1 - github.com/emvi/pirsch v1.1.1 + github.com/emvi/pirsch v1.2.0 github.com/go-sql-driver/mysql v1.5.0 // indirect github.com/gorilla/mux v1.7.4 github.com/gosimple/slug v1.9.0 diff --git a/go.sum b/go.sum index ccbb7bf..1bec4b4 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,8 @@ github.com/emvi/pirsch v1.1.0 h1:uMnxWqbcKLpt1iBNP52aocCkgpfZAisvKcF0VzpVHv8= github.com/emvi/pirsch v1.1.0/go.mod h1:+YmBbltJ3feZz9L/QQyqwywltYvQKBfzrGD51TPKl5g= github.com/emvi/pirsch v1.1.1 h1:memw5fHl6ZY1dcB4Ic5tTtsbQkU9wTCjBlXi4G8D20o= github.com/emvi/pirsch v1.1.1/go.mod h1:GDijqLHM331iWtmDmc7th19RxDrZadRkKoNvd9/kDX8= +github.com/emvi/pirsch v1.2.0 h1:k5OJwgE8/Zdq7raQNRF4aNHxWxPq7En51gWMMEFzinA= +github.com/emvi/pirsch v1.2.0/go.mod h1:GDijqLHM331iWtmDmc7th19RxDrZadRkKoNvd9/kDX8= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= diff --git a/main.go b/main.go index cd0ac92..8db7eba 100644 --- a/main.go +++ b/main.go @@ -60,7 +60,7 @@ func logEnvConfig() { func serveAbout() http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - tracker.Hit(r) + tracker.Hit(r, nil) tplCache.Render(w, "about.html", struct { Articles []emvi.Article }{ @@ -71,14 +71,14 @@ func serveAbout() http.HandlerFunc { func serveLegal() http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - tracker.Hit(r) + tracker.Hit(r, nil) tplCache.Render(w, "legal.html", nil) } } func serveBlogPage() http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - tracker.Hit(r) + tracker.Hit(r, nil) tplCache.Render(w, "blog.html", struct { Articles map[int][]emvi.Article }{ @@ -105,7 +105,7 @@ func serveBlogArticle() http.HandlerFunc { } // track the hit if the article was found, otherwise we don't care - tracker.Hit(r) + tracker.Hit(r, nil) tplCache.RenderWithoutCache(w, "article.html", struct { Title string @@ -121,7 +121,7 @@ func serveBlogArticle() http.HandlerFunc { func serveTracking() http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - tracker.Hit(r) + tracker.Hit(r, nil) start, _ := strconv.Atoi(r.URL.Query().Get("start")) if start > 365 { diff --git a/tracking/statistics.go b/tracking/statistics.go index a0339c4..1f9286c 100644 --- a/tracking/statistics.go +++ b/tracking/statistics.go @@ -86,7 +86,7 @@ func GetHourlyVisitorsToday() (template.JS, template.JS) { } func GetActiveVisitors() int { - visitors, err := analyzer.ActiveVisitors(time.Minute * 5) + visitors, err := analyzer.ActiveVisitors(pirsch.NullTenant, time.Minute*5) if err != nil { logbuch.Error("Error reading active visitors", logbuch.Fields{"err": err}) @@ -96,11 +96,6 @@ func GetActiveVisitors() int { return visitors } -func getStartTime(start int) time.Time { - startTime := today() - return startTime.Add(-time.Hour * 24 * time.Duration(start-1)) -} - func getLabelsAndData(visitors []pirsch.VisitorsPerDay) (template.JS, template.JS) { var labels strings.Builder var dp strings.Builder