mirror of
https://github.com/hrfee/jfa-go.git
synced 2024-12-23 01:20:11 +00:00
add extra logging
This commit is contained in:
parent
78049d4a33
commit
e6e5231f63
8
api.go
8
api.go
@ -1032,6 +1032,9 @@ func (app *appContext) GetUsers(gc *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
i := 0
|
i := 0
|
||||||
|
app.storage.usersLock.Lock()
|
||||||
|
defer app.storage.usersLock.Unlock()
|
||||||
|
fmt.Printf("GETUSERS user.json:\n%+v\n", app.storage.users)
|
||||||
for _, jfUser := range users {
|
for _, jfUser := range users {
|
||||||
user := respUser{
|
user := respUser{
|
||||||
ID: jfUser.ID,
|
ID: jfUser.ID,
|
||||||
@ -1046,8 +1049,11 @@ func (app *appContext) GetUsers(gc *gin.Context) {
|
|||||||
if email, ok := app.storage.emails[jfUser.ID]; ok {
|
if email, ok := app.storage.emails[jfUser.ID]; ok {
|
||||||
user.Email = email.(string)
|
user.Email = email.(string)
|
||||||
}
|
}
|
||||||
if expiry, ok := app.storage.users[jfUser.ID]; ok {
|
expiry, ok := app.storage.users[jfUser.ID]
|
||||||
|
fmt.Printf("CHECKING User: %s, ID: %s, Match: %t\n", user.Name, user.ID, ok)
|
||||||
|
if ok {
|
||||||
user.Expiry = app.formatDatetime(expiry)
|
user.Expiry = app.formatDatetime(expiry)
|
||||||
|
fmt.Printf("EXPIRY FOR User %s, ID: %s, Expiry: %+v, Formatted: %s\n", user.Name, user.ID, expiry, user.Expiry)
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.UserList[i] = user
|
resp.UserList[i] = user
|
||||||
|
@ -2,6 +2,7 @@ package main
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
@ -480,11 +481,11 @@ func (st *Storage) storeInvites() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (st *Storage) loadUsers() error {
|
func (st *Storage) loadUsers() error {
|
||||||
|
st.usersLock.Lock()
|
||||||
|
defer st.usersLock.Unlock()
|
||||||
if st.users == nil {
|
if st.users == nil {
|
||||||
st.users = map[string]time.Time{}
|
st.users = map[string]time.Time{}
|
||||||
}
|
}
|
||||||
st.usersLock.Lock()
|
|
||||||
defer st.usersLock.Unlock()
|
|
||||||
temp := map[string]time.Time{}
|
temp := map[string]time.Time{}
|
||||||
err := loadJSON(st.users_path, &temp)
|
err := loadJSON(st.users_path, &temp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -495,6 +496,7 @@ func (st *Storage) loadUsers() error {
|
|||||||
st.users[id] = t1
|
st.users[id] = t1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
fmt.Printf("CURRENT USERS:\n%+v\n", st.users)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,7 +35,6 @@ func (rt *userDaemon) run() {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
started := time.Now()
|
started := time.Now()
|
||||||
rt.app.storage.loadInvites()
|
|
||||||
rt.app.checkUsers()
|
rt.app.checkUsers()
|
||||||
finished := time.Now()
|
finished := time.Now()
|
||||||
duration := finished.Sub(started)
|
duration := finished.Sub(started)
|
||||||
@ -76,12 +75,8 @@ func (app *appContext) checkUsers() {
|
|||||||
}
|
}
|
||||||
for id, expiry := range app.storage.users {
|
for id, expiry := range app.storage.users {
|
||||||
if _, ok := userExists[id]; !ok {
|
if _, ok := userExists[id]; !ok {
|
||||||
app.debug.Printf("Deleting expiry for non-existent user \"%s\"", id)
|
app.info.Printf("Deleting expiry for non-existent user \"%s\"", id)
|
||||||
delete(app.storage.users, id)
|
delete(app.storage.users, id)
|
||||||
err = app.storage.storeUsers()
|
|
||||||
if err != nil {
|
|
||||||
app.err.Printf("Failed to store user duration: %s", err)
|
|
||||||
}
|
|
||||||
} else if time.Now().After(expiry) {
|
} else if time.Now().After(expiry) {
|
||||||
found := false
|
found := false
|
||||||
var user mediabrowser.User
|
var user mediabrowser.User
|
||||||
@ -111,10 +106,6 @@ func (app *appContext) checkUsers() {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
delete(app.storage.users, id)
|
delete(app.storage.users, id)
|
||||||
err = app.storage.storeUsers()
|
|
||||||
if err != nil {
|
|
||||||
app.err.Printf("Failed to store user duration: %s", err)
|
|
||||||
}
|
|
||||||
if email {
|
if email {
|
||||||
address, ok := app.storage.emails[id]
|
address, ok := app.storage.emails[id]
|
||||||
if !ok {
|
if !ok {
|
||||||
@ -131,4 +122,8 @@ func (app *appContext) checkUsers() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
err = app.storage.storeUsers()
|
||||||
|
if err != nil {
|
||||||
|
app.err.Printf("Failed to store user expiries: %s", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user