perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add bounced classification

Browse Source
This commit is contained in:
Jakob Borg
2015-07-15 13:45:33 +02:00
parent 0890b49e78
commit ca9d3b597e
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/aggregate/main.go
View File

@@ -75,6 +75,7 @@ func setupDB(db *sql.DB) error {
_, err = db.Exec(`CREATE TABLE IF NOT EXISTS UserMovement (
Day TIMESTAMP NOT NULL,
Added INTEGER NOT NULL,
Bounced INTEGER NOT NULL,
Removed INTEGER NOT NULL
)`)
if err != nil {
@@ -169,20 +170,26 @@ func aggregateUserMovement(db *sql.DB) (int64, error) {
day time.Time
added int
removed int
bounced int
}
var sumRows []sumRow
for t := minTs; t.Before(time.Now().Truncate(24 * time.Hour)); t = t.AddDate(0, 0, 1) {
var added, removed int
var added, removed, bounced int
old := t.Before(time.Now().AddDate(0, 0, -14))
for id, first := range firstSeen {
last := lastSeen[id]
if first.Equal(t) && last.Equal(t) && old {
bounced++
continue
}
if first.Equal(t) {
added++
}
if last == t && t.Before(time.Now().AddDate(0, 0, -14)) {
if last == t && old {
removed++
}
}
sumRows = append(sumRows, sumRow{t, added, removed})
sumRows = append(sumRows, sumRow{t, added, removed, bounced})
}
tx, err := db.Begin()
@@ -194,7 +201,7 @@ func aggregateUserMovement(db *sql.DB) (int64, error) {
return 0, err
}
for _, r := range sumRows {
if _, err := tx.Exec("INSERT INTO UserMovement (Day, Added, Removed) VALUES ($1, $2, $3)", r.day, r.added, r.removed); err != nil {
if _, err := tx.Exec("INSERT INTO UserMovement (Day, Added, Removed, Bounced) VALUES ($1, $2, $3, $4)", r.day, r.added, r.removed, r.bounced); err != nil {
tx.Rollback()
return 0, err
}

13
cmd/ursrv/main.go
View File

@@ -576,28 +576,31 @@ func getSummary(db *sql.DB) (summary, error) {
}
func getMovement(db *sql.DB) ([][]interface{}, error) {
rows, err := db.Query(`SELECT Day, Added, Removed FROM UserMovement WHERE Day > now() - '1 year'::INTERVAL ORDER BY Day`)
rows, err := db.Query(`SELECT Day, Added, Removed, Bounced FROM UserMovement WHERE Day > now() - '1 year'::INTERVAL ORDER BY Day`)
if err != nil {
return nil, err
}
defer rows.Close()
res := [][]interface{}{
{"Day", "Joined", "Left"},
{"Day", "Joined", "Left", "Bounced"},
}
for rows.Next() {
var day time.Time
var added, removed int
err := rows.Scan(&day, &added, &removed)
var added, removed, bounced int
err := rows.Scan(&day, &added, &removed, &bounced)
if err != nil {
return nil, err
}
row := []interface{}{day.Format("2006-01-02"), added, -removed}
row := []interface{}{day.Format("2006-01-02"), added, -removed, bounced}
if removed == 0 {
row[2] = nil
}
if bounced == 0 {
row[3] = nil
}
res = append(res, row)
}