Add second

This commit is contained in:
Daniel Mason 2023-05-24 20:55:13 +12:00
parent f43c3565ad
commit ed94a21a03
Signed by: idanoo
GPG key ID: 387387CDBC02F132
4 changed files with 26 additions and 1 deletions

View file

@ -79,6 +79,7 @@ func main() {
gms.PIXELFED_DB_SCHEMA = os.Getenv("PIXELFED_DB_SCHEMA")
gms.MATRIX_DB_SCHEMA = os.Getenv("MATRIX_DB_SCHEMA")
gms.MASTODON_DB_SCHEMA = os.Getenv("MASTODON_DB_SCHEMA")
gms.TINKERNZ_DB_SCHEMA = os.Getenv("TINKERNZ_DB_SCHEMA") // Second maston instance
gms.MOBILIZON_DB_SCHEMA = os.Getenv("MOBILIZON_DB_SCHEMA")
gms.PEERTUBE_DB_SCHEMA = os.Getenv("PEERTUBE_DB_SCHEMA")
gms.BOOKWYRM_DB_SCHEMA = os.Getenv("BOOKWYRM_DB_SCHEMA")

View file

@ -34,6 +34,7 @@ var (
PIXELFED_IDENTIFIER: "https://pixelfed.nz",
MATRIX_IDENTIFIDER: "https://mtrx.nz",
MASTODON_IDENTIFIER: "https://mastodon.nz",
TINKERNZ_IDENTIFIER: "https://tinker.nz",
MOBILIZON_IDENTIFIER: "https://openevents.nz",
PEERTUBE_IDENTIFIER: "https://peertube.nz",
BOOKWYRM_IDENTIFIER: "https://bookworm.nz",
@ -57,6 +58,10 @@ var (
MASTODON_1W_ACTIVE_USER_QUERY = "SELECT count(*) FROM users WHERE disabled = False AND confirmed_at IS NOT NULL AND approved = True AND current_sign_in_at >= now() - interval '1 week';"
MASTODON_IDENTIFIER = "mastodon"
// Mastodon 2
TINKERNZ_DB_SCHEMA string
TINKERNZ_IDENTIFIER = "tinkernz"
// Mobilizon
MOBILIZON_DB_SCHEMA string
MOBILIZON_USER_QUERY = "SELECT count(*) FROM users WHERE disabled = False;"

View file

@ -34,7 +34,8 @@ func postToMastodon(metrics []metric) {
msg = msg + "\n\n" + "#WeeklyStats"
toot := &mastodon.Toot{
Status: msg,
Visibility: "unlisted",
Status: msg,
}
_, err = c.PostStatus(context.Background(), toot)

View file

@ -104,6 +104,24 @@ func getUserCounts() ([]metric, error) {
}
}
// Second masto instance
if TINKERNZ_DB_SCHEMA != "" {
userCount, err := runIntQuery(TINKERNZ_DB_SCHEMA, MASTODON_USER_QUERY)
if err != nil {
log.Println(err)
} else {
m := metric{
Service: TINKERNZ_IDENTIFIER,
MetricName: METRICNAME_USERCOUNT,
MetricValue: userCount,
PreviousDayMetricValue: getLastMetric(TINKERNZ_IDENTIFIER),
PreviousWeekMetricValue: getLastWeekMetric(TINKERNZ_IDENTIFIER),
}
log.Printf("%s user count: %d", TINKERNZ_IDENTIFIER, userCount)
metrics = append(metrics, m)
}
}
if MOBILIZON_DB_SCHEMA != "" {
userCount, err := runIntQuery(MOBILIZON_DB_SCHEMA, MOBILIZON_USER_QUERY)
if err != nil {