Skip to content

Commit

Permalink
Merge branch 'main' into becca/rm-old-db-lock
Browse files Browse the repository at this point in the history
  • Loading branch information
RebeccaMahany authored Dec 19, 2024
2 parents f24b66c + fa6e3ac commit 07f0c5b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ee/debug/checkups/bboltdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package checkups
import (
"context"
"encoding/json"
"errors"
"fmt"
"io"
"os"
Expand All @@ -27,7 +26,8 @@ func (c *bboltdbCheckup) Name() string {
func (c *bboltdbCheckup) Run(_ context.Context, extraFH io.Writer) error {
db := c.k.BboltDB()
if db == nil {
return errors.New("no DB available")
// Not an error -- we are probably running standalone instead of in situ
return nil
}

stats, err := agent.GetStats(db)
Expand Down
5 changes: 3 additions & 2 deletions ee/debug/checkups/server_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ func (sdc *serverDataCheckup) Run(ctx context.Context, extraFH io.Writer) error
}

if store == nil {
sdc.status = Warning
sdc.summary = "no server_data store in knapsack"
// We are probably running standalone instead of in situ
sdc.status = Informational
sdc.summary = "server_data not available"
return nil
}

Expand Down

0 comments on commit 07f0c5b

Please sign in to comment.