[GOT-26] Edited the readme file and removed the Rollbar logger

evrone · Apr 2, 2021 · b760959 · b760959
1 parent c7a7ef5
commit b760959
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-include .env
+include .env.example
 export
 
 compose-up:

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Dependency Inversion (тот самый из SOLID) — принцип инве
 ключевую роль в построении архитектуры приложения. Чтобы принцип начал работать,
 нам нужно поделить приложение на слои.
 
-![Clean Architecture](pkg/img/layers.png)
+![Clean Architecture](docs/img/layers.png)
 
 Итак, приложение делится на 2 слоя, внутренний и внешний:
 1. **Бизнес-логика** (стандартная библиотека Go).
@@ -71,7 +71,7 @@ Dependency Inversion (тот самый из SOLID) — принцип инве
 
 То же самое на картинке:
 
-![Example](pkg/img/example-http-db.png)
+![Example](docs/img/example-http-db.png)
 
 ### Терминология Чистой Архитектуры
 - **Entities** — объекты, которыми оперирует бизнес-логика. В коде называются

diff --git a/cmd/app/main.go b/cmd/app/main.go
@@ -23,10 +23,7 @@ func main() {
 	zap := logger.NewZapLogger(cfg.Log.ZapLevel)
 	defer zap.Close()
 
-	rollbar := logger.NewRollbarLogger(cfg.Log.RollbarToken, cfg.Log.RollbarEnv)
-	defer rollbar.Close()
-
-	logger.NewAppLogger(zap, rollbar, cfg.App.Name, cfg.App.Version)
+	logger.NewAppLogger(zap, cfg.App.Name, cfg.App.Version)
 
 	// Run
 	app.Run(&cfg)

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,8 +24,6 @@ services:
     build: .
     container_name: app
     image: app
-    env_file:
-      - .env
     environment:
       PG_URL: 'postgres://user:pass@postgres:5432/postgres'
       RMQ_URL: 'amqp://guest:guest@rabbitmq:5672/'

diff --git a/pkg/img/example-http-db.png → docs/img/example-http-db.png b/pkg/img/example-http-db.png → docs/img/example-http-db.png
diff --git a/pkg/img/layers.png → docs/img/layers.png b/pkg/img/layers.png → docs/img/layers.png
diff --git a/go.mod b/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/jackc/pgx/v4 v4.10.1
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/rollbar/rollbar-go v1.2.0
 	github.com/streadway/amqp v1.0.0
 	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14
 	github.com/swaggo/gin-swagger v1.3.0

diff --git a/go.sum b/go.sum
@@ -490,8 +490,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 h1:HQagqIiBm
 github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rollbar/rollbar-go v1.2.0 h1:CUanFtVu0sa3QZ/fBlgevdGQGLWaE3D4HxoVSQohDfo=
-github.com/rollbar/rollbar-go v1.2.0/go.mod h1:czC86b8U4xdUH7W2C6gomi2jutLm8qK0OtrF5WMvpcc=
 github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=