2614b072f2
The analytics page showed non-unique counts for views and clicks which was misleading and source of confusion: #522, #561, #571, #676, #680 This commit changes this behaviour to pull unique views and clicks when individual subscriber tracking is turned on in settings, and non-unique counts when it is turned off (as `subscriber_id` in `campaign_views` and `link_clicks` will be NULL, rendering unique queries dysfunctional). This commit changes the stats SQL queries to use string interpolation to either to SELECT `*` or `DISTINCT subscriber_id` on app boot based on the setting in the DB. This involves significant changes to how queries are read and prepared on init. - Refactor `initQueries()` to `readQueries()` and `prepareQueries()`. - Read queries first before preparing. - Load settings from the DB using the read settings query. - Prepare queries next. Use the privacy setting from the DB to apply string interpolation to the analytics queries to pull unique/non-unique before preparing the queries. On the UI: - Show a note on the analytics page about unique/non-unique counts. - Hide the % donut charts on the analytics page in non-unique mode. Closes #676, closes #680
233 lines
6.1 KiB
Go
233 lines
6.1 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"log"
|
|
"os"
|
|
"os/signal"
|
|
"strings"
|
|
"sync"
|
|
"syscall"
|
|
"time"
|
|
|
|
"github.com/jmoiron/sqlx"
|
|
"github.com/knadh/koanf"
|
|
"github.com/knadh/koanf/providers/env"
|
|
"github.com/knadh/listmonk/internal/bounce"
|
|
"github.com/knadh/listmonk/internal/buflog"
|
|
"github.com/knadh/listmonk/internal/i18n"
|
|
"github.com/knadh/listmonk/internal/manager"
|
|
"github.com/knadh/listmonk/internal/media"
|
|
"github.com/knadh/listmonk/internal/messenger"
|
|
"github.com/knadh/listmonk/internal/subimporter"
|
|
"github.com/knadh/stuffbin"
|
|
)
|
|
|
|
const (
|
|
emailMsgr = "email"
|
|
)
|
|
|
|
// App contains the "global" components that are
|
|
// passed around, especially through HTTP handlers.
|
|
type App struct {
|
|
fs stuffbin.FileSystem
|
|
db *sqlx.DB
|
|
queries *Queries
|
|
constants *constants
|
|
manager *manager.Manager
|
|
importer *subimporter.Importer
|
|
messengers map[string]messenger.Messenger
|
|
media media.Store
|
|
i18n *i18n.I18n
|
|
bounce *bounce.Manager
|
|
notifTpls *notifTpls
|
|
log *log.Logger
|
|
bufLog *buflog.BufLog
|
|
|
|
// Channel for passing reload signals.
|
|
sigChan chan os.Signal
|
|
|
|
// Global variable that stores the state indicating that a restart is required
|
|
// after a settings update.
|
|
needsRestart bool
|
|
|
|
// Global state that stores data on an available remote update.
|
|
update *AppUpdate
|
|
sync.Mutex
|
|
}
|
|
|
|
var (
|
|
// Buffered log writer for storing N lines of log entries for the UI.
|
|
bufLog = buflog.New(5000)
|
|
lo = log.New(io.MultiWriter(os.Stdout, bufLog), "",
|
|
log.Ldate|log.Ltime|log.Lshortfile)
|
|
|
|
ko = koanf.New(".")
|
|
fs stuffbin.FileSystem
|
|
db *sqlx.DB
|
|
queries *Queries
|
|
|
|
// Compile-time variables.
|
|
buildString string
|
|
versionString string
|
|
|
|
// If these are set in build ldflags and static assets (*.sql, config.toml.sample. ./frontend)
|
|
// are not embedded (in make dist), these paths are looked up. The default values before, when not
|
|
// overridden by build flags, are relative to the CWD at runtime.
|
|
appDir string = "."
|
|
frontendDir string = "frontend"
|
|
)
|
|
|
|
func init() {
|
|
initFlags()
|
|
|
|
// Display version.
|
|
if ko.Bool("version") {
|
|
fmt.Println(buildString)
|
|
os.Exit(0)
|
|
}
|
|
|
|
lo.Println(buildString)
|
|
|
|
// Generate new config.
|
|
if ko.Bool("new-config") {
|
|
path := ko.Strings("config")[0]
|
|
if err := newConfigFile(path); err != nil {
|
|
lo.Println(err)
|
|
os.Exit(1)
|
|
}
|
|
lo.Printf("generated %s. Edit and run --install", path)
|
|
os.Exit(0)
|
|
}
|
|
|
|
// Load config files to pick up the database settings first.
|
|
initConfigFiles(ko.Strings("config"), ko)
|
|
|
|
// Load environment variables and merge into the loaded config.
|
|
if err := ko.Load(env.Provider("LISTMONK_", ".", func(s string) string {
|
|
return strings.Replace(strings.ToLower(
|
|
strings.TrimPrefix(s, "LISTMONK_")), "__", ".", -1)
|
|
}), nil); err != nil {
|
|
lo.Fatalf("error loading config from env: %v", err)
|
|
}
|
|
|
|
// Connect to the database, load the filesystem to read SQL queries.
|
|
db = initDB()
|
|
fs = initFS(appDir, frontendDir, ko.String("static-dir"), ko.String("i18n-dir"))
|
|
|
|
// Installer mode? This runs before the SQL queries are loaded and prepared
|
|
// as the installer needs to work on an empty DB.
|
|
if ko.Bool("install") {
|
|
// Save the version of the last listed migration.
|
|
install(migList[len(migList)-1].version, db, fs, !ko.Bool("yes"), ko.Bool("idempotent"))
|
|
os.Exit(0)
|
|
}
|
|
|
|
// Check if the DB schema is installed.
|
|
if ok, err := checkSchema(db); err != nil {
|
|
log.Fatalf("error checking schema in DB: %v", err)
|
|
} else if !ok {
|
|
lo.Fatal("the database does not appear to be setup. Run --install.")
|
|
}
|
|
|
|
if ko.Bool("upgrade") {
|
|
upgrade(db, fs, !ko.Bool("yes"))
|
|
os.Exit(0)
|
|
}
|
|
|
|
// Before the queries are prepared, see if there are pending upgrades.
|
|
checkUpgrade(db)
|
|
|
|
// Read the SQL queries from the queries file.
|
|
qMap := readQueries(queryFilePath, db, fs)
|
|
|
|
// Load settings from DB.
|
|
if q, ok := qMap["get-settings"]; ok {
|
|
initSettings(q.Query, db, ko)
|
|
}
|
|
|
|
// Prepare queries.
|
|
queries = prepareQueries(qMap, db, ko)
|
|
}
|
|
|
|
func main() {
|
|
// Initialize the main app controller that wraps all of the app's
|
|
// components. This is passed around HTTP handlers.
|
|
app := &App{
|
|
fs: fs,
|
|
db: db,
|
|
constants: initConstants(),
|
|
media: initMediaStore(),
|
|
messengers: make(map[string]messenger.Messenger),
|
|
log: lo,
|
|
bufLog: bufLog,
|
|
}
|
|
|
|
// Load i18n language map.
|
|
app.i18n = initI18n(app.constants.Lang, fs)
|
|
|
|
app.queries = queries
|
|
app.manager = initCampaignManager(app.queries, app.constants, app)
|
|
app.importer = initImporter(app.queries, db, app)
|
|
app.notifTpls = initNotifTemplates("/email-templates/*.html", fs, app.i18n, app.constants)
|
|
|
|
if ko.Bool("bounce.enabled") {
|
|
app.bounce = initBounceManager(app)
|
|
go app.bounce.Run()
|
|
}
|
|
|
|
// Initialize the default SMTP (`email`) messenger.
|
|
app.messengers[emailMsgr] = initSMTPMessenger(app.manager)
|
|
|
|
// Initialize any additional postback messengers.
|
|
for _, m := range initPostbackMessengers(app.manager) {
|
|
app.messengers[m.Name()] = m
|
|
}
|
|
|
|
// Attach all messengers to the campaign manager.
|
|
for _, m := range app.messengers {
|
|
app.manager.AddMessenger(m)
|
|
}
|
|
|
|
// Start the campaign workers. The campaign batches (fetch from DB, push out
|
|
// messages) get processed at the specified interval.
|
|
go app.manager.Run()
|
|
|
|
// Start the app server.
|
|
srv := initHTTPServer(app)
|
|
|
|
// Star the update checker.
|
|
if ko.Bool("app.check_updates") {
|
|
go checkUpdates(versionString, time.Hour*24, app)
|
|
}
|
|
|
|
// Wait for the reload signal with a callback to gracefully shut down resources.
|
|
// The `wait` channel is passed to awaitReload to wait for the callback to finish
|
|
// within N seconds, or do a force reload.
|
|
app.sigChan = make(chan os.Signal)
|
|
signal.Notify(app.sigChan, syscall.SIGHUP)
|
|
|
|
closerWait := make(chan bool)
|
|
<-awaitReload(app.sigChan, closerWait, func() {
|
|
// Stop the HTTP server.
|
|
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
|
|
defer cancel()
|
|
srv.Shutdown(ctx)
|
|
|
|
// Close the campaign manager.
|
|
app.manager.Close()
|
|
|
|
// Close the DB pool.
|
|
app.db.DB.Close()
|
|
|
|
// Close the messenger pool.
|
|
for _, m := range app.messengers {
|
|
m.Close()
|
|
}
|
|
|
|
// Signal the close.
|
|
closerWait <- true
|
|
})
|
|
}
|