better
This commit is contained in:
@@ -0,0 +1,83 @@
|
||||
package storage
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"git.tornberg.me/go-otel/internal/websocket"
|
||||
"github.com/natefinch/lumberjack"
|
||||
)
|
||||
|
||||
type FileStore struct {
|
||||
logger *lumberjack.Logger
|
||||
}
|
||||
|
||||
func NewFileStore(filename string) *FileStore {
|
||||
return &FileStore{
|
||||
logger: &lumberjack.Logger{
|
||||
Filename: filename,
|
||||
MaxSize: 100, // megabytes
|
||||
MaxBackups: 3,
|
||||
MaxAge: 28, // days
|
||||
Compress: true, // disabled by default
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func (fs *FileStore) Append(ctx context.Context, entry websocket.HistoryEntry) error {
|
||||
data, err := json.Marshal(entry)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = fs.logger.Write(append(data, '\n'))
|
||||
return err
|
||||
}
|
||||
|
||||
func (fs *FileStore) GetHistory(ctx context.Context, limit int) ([]websocket.HistoryEntry, error) {
|
||||
return fs.Search(ctx, "", limit)
|
||||
}
|
||||
|
||||
func (fs *FileStore) Search(ctx context.Context, query string, limit int) ([]websocket.HistoryEntry, error) {
|
||||
if limit <= 0 {
|
||||
limit = 50 // Default to a manageable number
|
||||
}
|
||||
|
||||
file, err := os.Open(fs.logger.Filename)
|
||||
if err != nil {
|
||||
if os.IsNotExist(err) {
|
||||
return nil, nil // No logs yet
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
defer file.Close()
|
||||
|
||||
var matchingLines []string
|
||||
scanner := bufio.NewScanner(file)
|
||||
// Lowercase query for case-insensitive search
|
||||
lowerQuery := strings.ToLower(query)
|
||||
|
||||
for scanner.Scan() {
|
||||
line := scanner.Text()
|
||||
if query == "" || strings.Contains(strings.ToLower(line), lowerQuery) {
|
||||
matchingLines = append(matchingLines, line)
|
||||
// Only keep the most recent 'limit' matches to save memory
|
||||
if len(matchingLines) > limit {
|
||||
matchingLines = matchingLines[1:]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var results []websocket.HistoryEntry
|
||||
// Reverse to get latest first (since matchingLines contains them in chronological order)
|
||||
for i := len(matchingLines) - 1; i >= 0; i-- {
|
||||
var entry websocket.HistoryEntry
|
||||
if err := json.Unmarshal([]byte(matchingLines[i]), &entry); err == nil {
|
||||
results = append(results, entry)
|
||||
}
|
||||
}
|
||||
|
||||
return results, scanner.Err()
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package storage
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"git.tornberg.me/go-otel/internal/websocket"
|
||||
)
|
||||
|
||||
func TestFileStore(t *testing.T) {
|
||||
filename := "test-otel.log"
|
||||
defer os.Remove(filename)
|
||||
|
||||
fs := NewFileStore(filename)
|
||||
ctx := context.Background()
|
||||
|
||||
entry1 := websocket.HistoryEntry{
|
||||
Type: "logs",
|
||||
Timestamp: 100,
|
||||
Data: map[string]interface{}{"msg": "hello world"},
|
||||
}
|
||||
entry2 := websocket.HistoryEntry{
|
||||
Type: "traces",
|
||||
Timestamp: 200,
|
||||
Data: map[string]interface{}{"msg": "trace event"},
|
||||
}
|
||||
|
||||
if err := fs.Append(ctx, entry1); err != nil {
|
||||
t.Fatalf("failed to append entry1: %v", err)
|
||||
}
|
||||
if err := fs.Append(ctx, entry2); err != nil {
|
||||
t.Fatalf("failed to append entry2: %v", err)
|
||||
}
|
||||
|
||||
// Test GetHistory (limit 1)
|
||||
history, err := fs.GetHistory(ctx, 1)
|
||||
if err != nil {
|
||||
t.Fatalf("GetHistory failed: %v", err)
|
||||
}
|
||||
if len(history) != 1 {
|
||||
t.Errorf("expected 1 entry, got %d", len(history))
|
||||
}
|
||||
// Should be latest entry
|
||||
if history[0].Type != "traces" {
|
||||
t.Errorf("expected latest entry type 'traces', got %s", history[0].Type)
|
||||
}
|
||||
|
||||
// Test Search
|
||||
results, err := fs.Search(ctx, "hello", 10)
|
||||
if err != nil {
|
||||
t.Fatalf("Search failed: %v", err)
|
||||
}
|
||||
if len(results) != 1 {
|
||||
t.Errorf("expected 1 result for search 'hello', got %d", len(results))
|
||||
}
|
||||
|
||||
// Check content of result
|
||||
data, _ := json.Marshal(results[0].Data)
|
||||
if string(data) != `{"msg":"hello world"}` {
|
||||
t.Errorf("unexpected data content: %s", string(data))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package storage
|
||||
|
||||
import (
|
||||
"context"
|
||||
"git.tornberg.me/go-otel/internal/websocket"
|
||||
)
|
||||
|
||||
type Store interface {
|
||||
Append(ctx context.Context, entry websocket.HistoryEntry) error
|
||||
GetHistory(ctx context.Context, limit int) ([]websocket.HistoryEntry, error)
|
||||
Search(ctx context.Context, query string, limit int) ([]websocket.HistoryEntry, error)
|
||||
}
|
||||
Reference in New Issue
Block a user