prepare for multi db setup

This commit is contained in:
2025-01-06 19:58:01 +01:00
parent f3125561eb
commit f719c73b46
9 changed files with 278 additions and 225 deletions

View File

@@ -1,7 +1,7 @@
package collectors
import "crowsnest/internal/model/sqlite"
import "crowsnest/internal/model/database"
type Collector struct {
Responses *sqlite.ResponseModel
Responses *database.ResponseModel
}

View File

@@ -1,8 +1,8 @@
package extractors
import "crowsnest/internal/model/sqlite"
import "crowsnest/internal/model/database"
type Extractor struct {
Responses *sqlite.ResponseModel
Articles *sqlite.ArticleModel
Responses *database.ResponseModel
Articles *database.ArticleModel
}

View File

@@ -3,7 +3,7 @@ package main
import (
"crowsnest/cmd/crawler/collectors"
"crowsnest/cmd/crawler/extractors"
"crowsnest/internal/model/sqlite"
"crowsnest/internal/model/database"
"database/sql"
"log"
@@ -19,7 +19,7 @@ func main() {
// collect websites
_ = collectors.Collector{
Responses: &sqlite.ResponseModel{DB: db},
Responses: &database.ResponseModel{DB: db},
}
//coll.Spiegel()
@@ -27,9 +27,9 @@ func main() {
// extract articles from websites
extr := extractors.Extractor{
Responses: &sqlite.ResponseModel{DB: db},
Articles: &sqlite.ArticleModel{DB: db},
Responses: &database.ResponseModel{DB: db},
Articles: &database.ArticleModel{DB: db},
}
extr.Spiegel()
extr.Spiegel()
}

View File

@@ -1,32 +1,50 @@
package main
import (
"crowsnest/internal/model/sqlite"
"crowsnest/internal/model/database"
"database/sql"
"errors"
"log"
"net/http"
"os"
_ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3"
)
type App struct {
articles *sqlite.ArticleModel
articles *database.ArticleModel
}
func main() {
db, err := sql.Open("sqlite3", "./persistence/app.db")
if err != nil { log.Fatal(err) }
// collect environement variables
databaseURL := os.Getenv("DB_URL")
dbDriver := os.Getenv("DB_DRIVER")
app := &App{
articles: &sqlite.ArticleModel{ DB: db },
}
// connect to database
var db *sql.DB
var err error
switch {
case dbDriver == "sqlite3":
db, err = sql.Open("sqlite3", databaseURL)
if err != nil {
log.Fatal(err)
}
default:
log.Fatal(errors.New("given DB_DRIVER is not supported"))
}
server := http.Server{
Addr: ":8080",
Handler: app.routes(),
}
// define app
app := &App{
articles: &database.ArticleModel{DB: db, DbDriver: dbDriver},
}
log.Println("server started, listening on :8080")
server.ListenAndServe()
// start web server
server := http.Server{
Addr: ":8080",
Handler: app.routes(),
}
log.Println("server started, listening on :8080")
server.ListenAndServe()
}