Merge pull request #382 from thecsw/http_logs

Adding goaccess support to the system.

.goaccess.caddy.conf

@@ -1,3 +1,6 @@
-log-format %h - - [%d:%t] "%r" %s %b
-time-format %T %z
+time-format %H:%M:%S
 date-format %d/%b/%Y
+log-format %h %^[%d:%t %^] "%r" %s %b "%R" "%u"
+log-file /srv/logs/access.log
+output /srv/report/index.html
+real-time-html true

api/api.go

@@ -1,20 +1,21 @@
 package main
 
 import (
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+	"os/signal"
+	"time"
+
 	"./coins"
 	"./firm"
 	"./firms"
 	"./investments"
 	"./investor"
 	"./investors"
 	"./summary"
-	"fmt"
 	"github.com/gorilla/mux"
-	"log"
-	"net/http"
-	"os"
-	"os/signal"
-	"time"
 )
 
 func HelloThere() func(w http.ResponseWriter, r *http.Request) {

api/coins/coins.go

@@ -1,13 +1,14 @@
 package coins
 
 import (
-	"../utils"
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	_ "github.com/go-sql-driver/mysql"
 	"log"
 	"net/http"
+
+	"../utils"
+	_ "github.com/go-sql-driver/mysql"
 )
 
 // Coins invested

api/firm/firm.go

@@ -1,15 +1,16 @@
 package firm
 
 import (
-	"../utils"
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/gorilla/mux"
 	"log"
 	"net/http"
 	"regexp"
+
+	"../utils"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/gorilla/mux"
 )
 
 type firm struct {

api/firms/firms.go

@@ -1,13 +1,14 @@
 package firms
 
 import (
-	"../utils"
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	_ "github.com/go-sql-driver/mysql"
 	"log"
 	"net/http"
+
+	"../utils"
+	_ "github.com/go-sql-driver/mysql"
 )
 
 type firm struct {

api/investments/investments.go

@@ -1,15 +1,16 @@
 package investments
 
 import (
-	"../utils"
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/gorilla/mux"
 	"log"
 	"net/http"
 	"regexp"
+
+	"../utils"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/gorilla/mux"
 )
 
 type investment struct {

api/investor/investor.go

@@ -1,15 +1,16 @@
 package investor
 
 import (
-	"../utils"
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	_ "github.com/go-sql-driver/mysql"
-	"github.com/gorilla/mux"
 	"log"
 	"net/http"
 	"regexp"
+
+	"../utils"
+	_ "github.com/go-sql-driver/mysql"
+	"github.com/gorilla/mux"
 )
 
 type investor struct {

api/investors/investors.go

@@ -1,14 +1,15 @@
 package investors
 
 import (
-	"../utils"
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	_ "github.com/go-sql-driver/mysql"
 	"log"
 	"net/http"
 	"time"
+
+	"../utils"
+	_ "github.com/go-sql-driver/mysql"
 )
 
 type investor struct {

api/summary/summary.go

@@ -1,14 +1,15 @@
 package summary
 
 import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
 	"../coins"
 	"../investments"
 	"../investors"
 	"../utils"
-	"encoding/json"
-	"fmt"
 	_ "github.com/go-sql-driver/mysql"
-	"net/http"
 )
 
 func Summary() func(w http.ResponseWriter, r *http.Request) {

docker-compose.yml

@@ -68,11 +68,30 @@ services:
         restart: unless-stopped
         ports:
           - 2015:2015
+          - 80:80
+          - 443:443
+        volumes:
+          - "/data/memeinvestor/caddy/data:/root/.caddy"
+          - "/data/memeinvestor/caddy/logs:/var/log"
+          - "/data/memeinvestor/goaccess/html:/site/goaccess"
 
     mysql:
         image: mariadb:10.2.15
         env_file: .env
         restart: unless-stopped
         ports:
           - 127.0.0.1:3306:3306
+        volumes:
+          - "/data/memeinvestor/mysql:/var/lib/mysql"
 
+    goaccess:
+       build:
+           context: .
+           dockerfile: docker/Dockerfile-goaccess
+       entrypoint: goaccess --config-file=/etc/.goaccess.caddy.conf
+       volumes:
+         - "/data/memeinvestor/caddy/logs:/srv/logs"
+         - "/data/memeinvestor/goaccess/data:/srv/data"
+         - "/data/memeinvestor/goaccess/html:/srv/report"
+       depends_on:
+         - http

docker/Caddyfile

@@ -1,15 +1,18 @@
-memes.market {
-	redir https://meme.market
-}
-
 {$CADDY_WEB_ADDRESS} {
         cors
-	root /static
+	root /srv
+	gzip
 	proxy /api/ api:5000 {
 		without /api/
 		transparent
 	}
 
-	log / stdout
+	log / /var/log/access.log "{combined}"
 	errors stdout
+}
+
+{$CADDY_WEB_ADDRESS}/go {
+        basicauth / admin password
+        root /site/goaccess
+        gzip
 }

docker/Dockerfile-caddy

@@ -1,16 +1,4 @@
-FROM alpine
+FROM abiosoft/caddy
 
-RUN apk add --update --no-cache \
-    bash \
-    curl
-
-RUN curl https://getcaddy.com | bash -s personal http.cors
-
-WORKDIR /caddy
-
-COPY ./docker/Caddyfile /caddy
-COPY ./docs /static
-
-EXPOSE 80 443 2015
-
-CMD [ "caddy" ]
+COPY ./docker/Caddyfile /etc
+COPY ./docs /srv

docker/Dockerfile-goaccess

@@ -0,0 +1,4 @@
+FROM allinurl/goaccess
+
+COPY ./.goaccess.caddy.conf /etc
+RUN touch /srv/logs/caddy.log