add database connection
This commit is contained in:
1 parent
2a5c0b9ffa
commit
9d8914bf26
7 files changed
+75
-4
No files matched your search
@@ -3,13 +3,15 @@ package restserver
|
||||
import (
|
||||
"io/ioutil"
|
||||
|
||||
"git.ukamnya.ru/stulyaganov/RestApi/internal/bd"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
BindAddr string `yaml:"bind_addr"`
|
||||
BindPort string `yaml:"bind_port"`
|
||||
LogLevel string `yaml:"log_level"`
|
||||
BindAddr string `yaml:"bind_addr"`
|
||||
BindPort string `yaml:"bind_port"`
|
||||
LogLevel string `yaml:"log_level"`
|
||||
DB *bd.ConfigBD `yaml:"DB"`
|
||||
}
|
||||
|
||||
func NewConfig() *Config {
|
||||
@@ -17,6 +19,7 @@ func NewConfig() *Config {
|
||||
BindAddr: ":127.0.0.1",
|
||||
BindPort: ":8080",
|
||||
LogLevel: "debug",
|
||||
DB: bd.NewConfig(),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"io"
|
||||
"net/http"
|
||||
|
||||
"git.ukamnya.ru/stulyaganov/RestApi/internal/bd"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
@@ -12,6 +13,7 @@ type RestServer struct {
|
||||
config *Config
|
||||
logger *logrus.Logger
|
||||
router *mux.Router
|
||||
db *bd.Bd
|
||||
}
|
||||
|
||||
func New(config *Config) *RestServer {
|
||||
@@ -26,6 +28,10 @@ func (r *RestServer) Start() error {
|
||||
if err := r.configureLogger(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := r.configurebd(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
r.configureRouter()
|
||||
|
||||
r.logger.Info("Starting Server")
|
||||
@@ -46,6 +52,17 @@ func (r *RestServer) configureRouter() {
|
||||
r.router.HandleFunc("/hello", r.HandleHello())
|
||||
}
|
||||
|
||||
func (r *RestServer) configurebd() error {
|
||||
dataBase := bd.New(r.config.DB)
|
||||
if err := dataBase.Open(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
r.db = dataBase
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *RestServer) HandleHello() http.HandlerFunc {
|
||||
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
Reference in new issue
Block a user