diff --git a/.gitignore b/.gitignore index c0bc3c4..f16ebae 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,10 @@ coverage *.sln *.sw? *.tsbuildinfo -/bin/ /config/config.yaml +/config/config.yml +config.yaml +config.yml +example.config.yml +example.config.yaml main \ No newline at end of file diff --git a/cmd/main.go b/cmd/main.go index 2b04f3c..d5d5075 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -3,6 +3,8 @@ package main import ( "context" "fmt" + "os" + "github.com/nats-io/nats.go" "madsky.ru/go-tracker/internal/broker" "madsky.ru/go-tracker/internal/config" @@ -10,11 +12,10 @@ import ( "madsky.ru/go-tracker/internal/logger" "madsky.ru/go-tracker/internal/server" "madsky.ru/go-tracker/internal/storage" - "os" ) func main() { - cfg := config.MustLoad("./config/config.yaml") + cfg := config.MustLoad("./config.yaml") log := logger.NewLogger() dsn := getDSN(cfg.Database.Host, cfg.Database.Port, cfg.Database.User, cfg.Database.Password, cfg.Database.Name) diff --git a/config/example.config.yaml b/config/example.config.yaml deleted file mode 100644 index 8cf8a5c..0000000 --- a/config/example.config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -app_name: 'APP' -nats: - host: '' - token: '' -database: - host: '' - port: 5432 - user: '' - password: '' - name: 'tracker' \ No newline at end of file