Skip to content

Commit 6121e81

Browse files
Peyton-Spencerhaaawk
authored andcommitted
simplify example
1 parent f9f3544 commit 6121e81

File tree

5 files changed

+9
-202
lines changed

5 files changed

+9
-202
lines changed

example/remote/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

example/remote/README.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

example/remote/envs/.env.example

Lines changed: 0 additions & 2 deletions
This file was deleted.

example/remote/envs/envs.go

Lines changed: 0 additions & 141 deletions
This file was deleted.

example/remote/main.go

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,22 @@ package main
33
import (
44
"database/sql"
55
"fmt"
6-
"log/slog"
76
"os"
87
"time"
98

109
_ "github.com/tursodatabase/go-libsql"
11-
"github.com/tursodatabase/go-libsql/example/remote/envs"
1210
)
1311

1412
func main() {
15-
setupSlog()
1613
if err := run(); err != nil {
17-
slog.Error("error running example", "error", err)
14+
fmt.Fprintf(os.Stderr, "error running example: %v\n", err)
1815
os.Exit(1)
1916
}
2017
}
2118

2219
func run() (err error) {
23-
err = envs.Load()
24-
if err != nil {
25-
return fmt.Errorf("error loading environment variables: %w", err)
26-
}
2720
// Get database URL and auth token from environment variables
28-
dbUrl := envs.TURSO_URL
21+
dbUrl := os.Getenv("TURSO_URL")
2922
if dbUrl == "" {
3023
return fmt.Errorf("TURSO_URL environment variable not set")
3124
}
@@ -40,17 +33,9 @@ func run() (err error) {
4033
if err != nil {
4134
return fmt.Errorf("error opening cloud db: %w", err)
4235
}
43-
defer func() {
44-
if closeErr := db.Close(); closeErr != nil {
45-
slog.Error("error closing libsql db", "error", closeErr)
46-
if err == nil {
47-
err = closeErr
48-
}
49-
} else {
50-
slog.Debug("closed libsql db")
51-
}
52-
}()
53-
// Configure connection pool: https://github.com/tursodatabase/go-libsql/issues/13
36+
defer db.Close()
37+
38+
// Configure connection pool
5439
db.SetConnMaxIdleTime(9 * time.Second)
5540

5641
// Create test table
@@ -72,24 +57,17 @@ func run() (err error) {
7257
if err != nil {
7358
return fmt.Errorf("error inserting data: %w", err)
7459
}
75-
slog.Debug("inserted test data")
60+
fmt.Println("Inserted test data")
7661
} else {
77-
slog.Debug("test data already exists, skipping insert")
62+
fmt.Println("Test data already exists, skipping insert")
7863
}
7964

8065
// Query the data
8166
rows, err := db.Query("SELECT * FROM test")
8267
if err != nil {
8368
return fmt.Errorf("error querying data: %w", err)
8469
}
85-
defer func() {
86-
if closeErr := rows.Close(); closeErr != nil {
87-
slog.Error("error closing rows", "error", closeErr)
88-
if err == nil {
89-
err = closeErr
90-
}
91-
}
92-
}()
70+
defer rows.Close()
9371

9472
// Print results
9573
for rows.Next() {
@@ -104,21 +82,6 @@ func run() (err error) {
10482
return fmt.Errorf("error iterating rows: %w", err)
10583
}
10684

107-
slog.Debug("successfully connected and executed queries", "url", envs.TURSO_URL)
85+
fmt.Printf("Successfully connected and executed queries on %s\n", dbUrl)
10886
return nil
10987
}
110-
111-
func setupSlog() {
112-
// Configure slog to only show log level
113-
logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
114-
Level: slog.LevelDebug,
115-
ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
116-
// Remove time attribute
117-
if a.Key == "time" {
118-
return slog.Attr{}
119-
}
120-
return a
121-
},
122-
}))
123-
slog.SetDefault(logger)
124-
}

0 commit comments

Comments
 (0)