amigan/stillbox
1
1
Fork 0
Code Issues 33 Pull requests Projects Releases Packages Wiki Activity Actions

Lint

Browse source
This commit is contained in:
Daniel Ponte 2024-11-20 11:07:58 -05:00
parent da73227c79
commit 2872f1d437
5 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/stillbox/main.go
View file

@ -35,5 +35,6 @@ func main() {
cmds := append([]*cobra.Command{serve.Command(cfg)}, admin.Command(cfg)...)
rootCmd.AddCommand(cmds...)
rootCmd.Execute()
// cobra is already checking for errors and will print them
_ = rootCmd.Execute()
}

1
pkg/alerting/alerting.go
View file

@ -198,7 +198,6 @@ func (as *alerter) eval(ctx context.Context, now time.Time, testMode bool) ([]al
}
func (as *alerter) testNotifyHandler(w http.ResponseWriter, r *http.Request) {
alerts := make([]alert.Alert, 0, len(as.scores))
ctx := r.Context()
alerts, err := as.eval(ctx, time.Now(), true)

1
pkg/database/database.go
View file

@ -43,6 +43,7 @@ func (db *Database) InTx(ctx context.Context, f func(Store) error, opts pgx.TxOp
return fmt.Errorf("Tx begin: %w", err)
}
//nolint:errcheck
defer tx.Rollback(ctx)
dbtx := &Database{Pool: db.Pool, Queries: db.Queries.WithTx(tx)}

5
pkg/rest/talkgroups.go
View file

@ -32,7 +32,7 @@ type tgParams struct {
ID *int `param:"id"`
}
func (t tgParams) haveBoth() bool {
func (t tgParams) hasBoth() bool {
return t.System != nil && t.ID != nil
}
@ -65,11 +65,12 @@ func (tga *talkgroupAPI) get(w http.ResponseWriter, r *http.Request) {
var res interface{}
switch {
case p.System != nil && p.ID != nil:
case p.hasBoth():
res, err = tgs.TG(ctx, talkgroups.TG(*p.System, *p.ID))
case p.System != nil:
res, err = tgs.SystemTGs(ctx, int32(*p.System))
default:
// get all talkgroups
res, err = tgs.TGs(ctx, nil)
}

35
pkg/talkgroups/store.go
View file

@ -129,15 +129,13 @@ func (t *cache) Hint(ctx context.Context, tgs []ID) error {
return nil
}
func (t *cache) add(rec *Talkgroup) error {
func (t *cache) add(rec *Talkgroup) {
t.Lock()
defer t.Unlock()
tg := TG(rec.System.ID, rec.Talkgroup.TGID)
t.tgs[tg] = rec
t.systems[int32(rec.System.ID)] = rec.System.Name
return nil
}
type row interface {
@ -156,18 +154,15 @@ func rowToTalkgroup[T row](r T) *Talkgroup {
}
}
func addToRowList[T row](t *cache, r []*Talkgroup, tgRecords []T) ([]*Talkgroup, error) {
func addToRowList[T row](t *cache, r []*Talkgroup, tgRecords []T) []*Talkgroup {
for _, rec := range tgRecords {
tg := rowToTalkgroup(rec)
err := t.add(tg)
if err != nil {
return nil, err
}
t.add(tg)
r = append(r, tg)
}
return r, nil
return r
}
func (t *cache) TGs(ctx context.Context, tgs IDs) ([]*Talkgroup, error) {
@ -190,7 +185,7 @@ func (t *cache) TGs(ctx context.Context, tgs IDs) ([]*Talkgroup, error) {
if err != nil {
return nil, err
}
return addToRowList(t, r, tgRecords)
return addToRowList(t, r, tgRecords), nil
}
// get all talkgroups
@ -199,7 +194,7 @@ func (t *cache) TGs(ctx context.Context, tgs IDs) ([]*Talkgroup, error) {
if err != nil {
return nil, err
}
return addToRowList(t, r, tgRecords)
return addToRowList(t, r, tgRecords), nil
}
func (t *cache) Load(ctx context.Context, tgs database.TGTuples) error {
@ -209,11 +204,7 @@ func (t *cache) Load(ctx context.Context, tgs database.TGTuples) error {
}
for _, rec := range tgRecords {
err := t.add(rowToTalkgroup(rec))
if err != nil {
log.Error().Err(err).Msg("add alert config fail")
}
t.add(rowToTalkgroup(rec))
}
return nil
@ -239,7 +230,7 @@ func (t *cache) SystemTGs(ctx context.Context, systemID int32) ([]*Talkgroup, er
}
r := make([]*Talkgroup, 0, len(recs))
return addToRowList(t, r, recs)
return addToRowList(t, r, recs), nil
}
func (t *cache) TG(ctx context.Context, tg ID) (*Talkgroup, error) {
@ -261,11 +252,7 @@ func (t *cache) TG(ctx context.Context, tg ID) (*Talkgroup, error) {
return nil, errors.Join(ErrNotFound, err)
}
err = t.add(rowToTalkgroup(record))
if err != nil {
log.Error().Err(err).Msg("TG() cache add")
return rowToTalkgroup(record), errors.Join(ErrNotFound, err)
}
t.add(rowToTalkgroup(record))
return rowToTalkgroup(record), nil
}
@ -365,10 +352,8 @@ func (t *cache) UpsertTGs(ctx context.Context, system int, input []database.Upse
}
// update the cache
t.Lock()
defer t.Unlock()
for _, tg := range tgs {
t.tgs[TG(tg.SystemID, tg.TGID)] = tg
t.add(tg)
}
return tgs, nil