parent
7204ae2e19
commit
8c1aa6b39b
@ -106,7 +106,8 @@ manually, you can install newer version of Go into your `GOPATH`:
|
|||||||
# redact IP addresses
|
# redact IP addresses
|
||||||
redact_ip_addresses=false
|
redact_ip_addresses=false
|
||||||
|
|
||||||
# database type for statistics data, currently supports: bolt, mysql, postgresql
|
# database type for statistics data, currently supports: none, bolt, mysql, postgresql
|
||||||
|
# if none is specified, no telemetry/stats will be recorded, and no result PNG will be generated
|
||||||
database_type="postgresql"
|
database_type="postgresql"
|
||||||
database_hostname="localhost"
|
database_hostname="localhost"
|
||||||
database_name="speedtest"
|
database_name="speedtest"
|
||||||
|
@ -5,12 +5,10 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.etcd.io/bbolt"
|
|
||||||
|
|
||||||
"github.com/librespeed/speedtest/database/schema"
|
"github.com/librespeed/speedtest/database/schema"
|
||||||
|
|
||||||
_ "github.com/go-sql-driver/mysql"
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
"go.etcd.io/bbolt"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -4,8 +4,11 @@ import (
|
|||||||
"github.com/librespeed/speedtest/config"
|
"github.com/librespeed/speedtest/config"
|
||||||
"github.com/librespeed/speedtest/database/bolt"
|
"github.com/librespeed/speedtest/database/bolt"
|
||||||
"github.com/librespeed/speedtest/database/mysql"
|
"github.com/librespeed/speedtest/database/mysql"
|
||||||
|
"github.com/librespeed/speedtest/database/none"
|
||||||
"github.com/librespeed/speedtest/database/postgresql"
|
"github.com/librespeed/speedtest/database/postgresql"
|
||||||
"github.com/librespeed/speedtest/database/schema"
|
"github.com/librespeed/speedtest/database/schema"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -26,5 +29,9 @@ func SetDBInfo(conf *config.Config) {
|
|||||||
DB = mysql.Open(conf.DatabaseHostname, conf.DatabaseUsername, conf.DatabasePassword, conf.DatabaseName)
|
DB = mysql.Open(conf.DatabaseHostname, conf.DatabaseUsername, conf.DatabasePassword, conf.DatabaseName)
|
||||||
case "bolt":
|
case "bolt":
|
||||||
DB = bolt.Open(conf.DatabaseFile)
|
DB = bolt.Open(conf.DatabaseFile)
|
||||||
|
case "none":
|
||||||
|
DB = none.Open("")
|
||||||
|
default:
|
||||||
|
log.Fatalf("Unsupported database type: %s", conf.DatabaseType)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
23
database/none/none.go
Normal file
23
database/none/none.go
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
package none
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/librespeed/speedtest/database/schema"
|
||||||
|
)
|
||||||
|
|
||||||
|
type None struct{}
|
||||||
|
|
||||||
|
func Open(_ string) *None {
|
||||||
|
return &None{}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *None) Insert(_ *schema.TelemetryData) error {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *None) FetchByUUID(_ string) (*schema.TelemetryData, error) {
|
||||||
|
return &schema.TelemetryData{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (n *None) FetchLast100() ([]schema.TelemetryData, error) {
|
||||||
|
return []schema.TelemetryData{}, nil
|
||||||
|
}
|
@ -4,6 +4,7 @@ import (
|
|||||||
"html/template"
|
"html/template"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/go-chi/render"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
"github.com/librespeed/speedtest/config"
|
"github.com/librespeed/speedtest/config"
|
||||||
@ -27,6 +28,12 @@ func Stats(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
conf := config.LoadedConfig()
|
conf := config.LoadedConfig()
|
||||||
|
|
||||||
|
if conf.DatabaseType == "none" {
|
||||||
|
render.PlainText(w, r, "Statistics are disabled")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
var data StatsData
|
var data StatsData
|
||||||
|
|
||||||
if conf.StatsPassword == "PASSWORD" {
|
if conf.StatsPassword == "PASSWORD" {
|
||||||
|
@ -14,6 +14,7 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/go-chi/render"
|
||||||
"github.com/librespeed/speedtest/config"
|
"github.com/librespeed/speedtest/config"
|
||||||
"github.com/librespeed/speedtest/database"
|
"github.com/librespeed/speedtest/database"
|
||||||
"github.com/librespeed/speedtest/database/schema"
|
"github.com/librespeed/speedtest/database/schema"
|
||||||
@ -144,6 +145,12 @@ func Initialize(c *config.Config) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func Record(w http.ResponseWriter, r *http.Request) {
|
func Record(w http.ResponseWriter, r *http.Request) {
|
||||||
|
conf := config.LoadedConfig()
|
||||||
|
if conf.DatabaseType == "none" {
|
||||||
|
render.PlainText(w, r, "Telemetry is disabled")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
ipAddr, _, _ := net.SplitHostPort(r.RemoteAddr)
|
ipAddr, _, _ := net.SplitHostPort(r.RemoteAddr)
|
||||||
userAgent := r.UserAgent()
|
userAgent := r.UserAgent()
|
||||||
language := r.Header.Get("Accept-Language")
|
language := r.Header.Get("Accept-Language")
|
||||||
@ -201,6 +208,12 @@ func Record(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func DrawPNG(w http.ResponseWriter, r *http.Request) {
|
func DrawPNG(w http.ResponseWriter, r *http.Request) {
|
||||||
|
conf := config.LoadedConfig()
|
||||||
|
|
||||||
|
if conf.DatabaseType == "none" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
uuid := r.FormValue("id")
|
uuid := r.FormValue("id")
|
||||||
record, err := database.DB.FetchByUUID(uuid)
|
record, err := database.DB.FetchByUUID(uuid)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -18,7 +18,8 @@ statistics_password="PASSWORD"
|
|||||||
# redact IP addresses
|
# redact IP addresses
|
||||||
redact_ip_addresses=false
|
redact_ip_addresses=false
|
||||||
|
|
||||||
# database type for statistics data, currently supports: bolt, mysql, postgresql
|
# database type for statistics data, currently supports: none, bolt, mysql, postgresql
|
||||||
|
# if none is specified, no telemetry/stats will be recorded, and no result PNG will be generated
|
||||||
database_type="bolt"
|
database_type="bolt"
|
||||||
database_hostname=""
|
database_hostname=""
|
||||||
database_name=""
|
database_name=""
|
||||||
|
Loading…
Reference in New Issue
Block a user