OTUS
/
Golang_HomeWork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HW12 изменил структуру проекта на более привычную

pull/13/head
Andrey Ivanov 2020-09-01 15:52:51 +03:00 committed by Andrey Ivanov
parent 5c07ac5193
commit 195c5ec84a
10 changed files with 66 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw12_13_14_15_calendar/configs/config.toml
View File

@ -1,11 +1,11 @@
[logger]
file = "./calendar.log"
level = "INFO"
[Logger]
File = "./calendar.log"
Level = "INFO"
[storage]
in_memory = false
sql_host = "localhost"
sql_port = "5432"
sql_dbase = "calendar"
sql_user = "calendar"
sql_pass = "12345678"
[Storage]
inMemory = false
SQLHost = "localhost"
SQLPort = "5432"
SQLDbase = "calendar"
SQLUser = "calendar"
SQLPass = "12345678"

17
hw12_13_14_15_calendar/src/config/config.go
View File

@ -1,9 +1,10 @@
package config
import (
"github.com/BurntSushi/toml"
"io/ioutil"
"os"
"github.com/BurntSushi/toml"
)
type Config struct {
@ -13,16 +14,16 @@ type Config struct {
MuteStdout bool
}
Storage struct {
In_memory bool
Sql_host string
Sql_port string
Sql_dbase string
Sql_user string
Sql_pass string
InMemory bool
SQLHost string
SQLPort string
SQLDbase string
SQLUser string
SQLPass string
}
}
// Confita может быти и хороша, но она не возвращает ошибки, если не может распарсить файл в структуру. Мне не нравится такая "молчаливость"
// Confita может быти и хороша, но она не возвращает ошибки, если не может распарсить файл в структуру. Мне не нравится такая "молчаливость".
func NewConfig(configFile string) (Config, error) {
f, err := os.Open(configFile)
if err != nil {

8
hw12_13_14_15_calendar/src/config/config_test.go
View File

@ -32,8 +32,8 @@ V`)
}
defer os.Remove(goodfile.Name())
goodfile.WriteString(`[storage]
in_memory = true
sql_host = "localhost"`)
inMemory = true
SQLHost = "localhost"`)
goodfile.Sync()
t.Run("No such file", func(t *testing.T) {
@ -50,8 +50,8 @@ sql_host = "localhost"`)
t.Run("TOML reading", func(t *testing.T) {
c, e := NewConfig(goodfile.Name())
require.Equal(t, true, c.Storage.In_memory)
require.Equal(t, "localhost", c.Storage.Sql_host)
require.Equal(t, true, c.Storage.InMemory)
require.Equal(t, "localhost", c.Storage.SQLHost)
require.NoError(t, e)
})

26
hw12_13_14_15_calendar/src/logger/logger.go
View File

@ -2,19 +2,20 @@ package logger
import (
"errors"
amitralog "github.com/amitrai48/logger"
"github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/config"
"log"
"os"
"strings"
amitralog "github.com/amitrai48/logger"
"github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/config"
)
type Logger interface {
Debug(msg string)
Info(msg string)
Warn(msg string)
Error(msg string)
Fatal(msg string)
Debugf(format string, args ...interface{})
Infof(format string, args ...interface{})
Warnf(format string, args ...interface{})
Errorf(format string, args ...interface{})
Fatalf(format string, args ...interface{})
}
type Log struct {
@ -22,7 +23,6 @@ type Log struct {
}
func New(conf config.Config) (Log, error) {
if conf.Logger.File == "" || !validLevel(conf.Logger.Level) {
return Log{}, errors.New("invalid logger config")
}
@ -44,23 +44,23 @@ func New(conf config.Config) (Log, error) {
return Log{Logger: l}, nil
}
func (l Log) Debug(format string, args ...interface{}) {
func (l Log) Debugf(format string, args ...interface{}) {
l.Logger.Debugf(format, args)
}
func (l *Log) Info(format string, args ...interface{}) {
func (l *Log) Infof(format string, args ...interface{}) {
l.Logger.Infof(format, args)
}
func (l *Log) Warn(format string, args ...interface{}) {
func (l *Log) Warnf(format string, args ...interface{}) {
l.Logger.Warnf(format, args)
}
func (l *Log) Error(format string, args ...interface{}) {
func (l *Log) Errorf(format string, args ...interface{}) {
l.Logger.Errorf(format, args)
}
func (l *Log) Fatal(format string, args ...interface{}) {
func (l *Log) Fatalf(format string, args ...interface{}) {
l.Logger.Fatalf(format, args)
os.Exit(2)
}

4
hw12_13_14_15_calendar/src/logger/logger_test.go
View File

@ -28,8 +28,8 @@ func TestLoggerLogic(t *testing.T) {
}
t.Run("Messages arround the level", func(t *testing.T) {
log.Debug("debug message")
log.Error("error message")
log.Debugf("debug message")
log.Errorf("error message")
res, err := ioutil.ReadAll(tmpfile)
if err != nil {

11
hw12_13_14_15_calendar/src/main.go
View File

@ -2,14 +2,15 @@ package main
import (
"flag"
oslog "log"
"os"
"os/signal"
"github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/app"
"github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/config"
"github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/logger"
internalhttp "github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/server/http"
store "github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/storage"
oslog "log"
"os"
"os/signal"
)
var configFile string
@ -47,12 +48,12 @@ func main() {
signal.Stop(signals)
if err := server.Stop(); err != nil {
log.Error("failed to stop http server: " + err.Error())
log.Errorf("failed to stop http server: " + err.Error())
}
}()
if err := server.Start(); err != nil {
log.Error("failed to start http server: " + err.Error())
log.Errorf("failed to start http server: " + err.Error())
os.Exit(1)
}
}

14
hw12_13_14_15_calendar/src/server/http/middleware.go
View File

@ -1,11 +1,7 @@
package internalhttp
import (
"net/http"
)
func loggingMiddleware(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO
})
}
//func loggingMiddleware(next http.Handler) http.Handler {
// return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
// TODO
// })
//}

15
hw12_13_14_15_calendar/src/storage/memory/memorystorage.go
View File

@ -2,34 +2,33 @@ package memorystorage
import (
"github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/storage/event"
"sync"
)
type Storage struct {
events []event.Event
mu sync.RWMutex
//events []event.Event
//mu sync.RWMutex
}
func New() *Storage {
return &Storage{}
}
func (s Storage) Save(event event.Event) error {
func (s *Storage) Save(event event.Event) error {
return nil
}
func (s Storage) Update(event event.Event) error {
func (s *Storage) Update(event event.Event) error {
return nil
}
func (s Storage) Delete(event event.Event) error {
func (s *Storage) Delete(event event.Event) error {
return nil
}
func (s Storage) List() []event.Event {
func (s *Storage) List() []event.Event {
return []event.Event{}
}
func (s Storage) Get(id string) (event.Event, bool) {
func (s *Storage) Get(id string) (event.Event, bool) {
return event.Event{}, false
}

13
hw12_13_14_15_calendar/src/storage/sql/sqlstorage.go
View File

@ -2,8 +2,9 @@ package sqlstorage
import (
"context"
"github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/storage/event"
"sync"
"github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/storage/event"
)
type Storage struct {
@ -25,7 +26,7 @@ func (s *Storage) Close(ctx context.Context) error {
return nil
}
func (s Storage) Save(e event.Event) error {
func (s *Storage) Save(e event.Event) error {
if _, ok := s.Get(e.ID); !ok {
s.Mu.Lock()
s.Events = append(s.Events, e)
@ -34,18 +35,18 @@ func (s Storage) Save(e event.Event) error {
return nil
}
func (s Storage) Update(event event.Event) error {
func (s *Storage) Update(event event.Event) error {
return nil
}
func (s Storage) Delete(event event.Event) error {
func (s *Storage) Delete(event event.Event) error {
return nil
}
func (s Storage) List() []event.Event {
func (s *Storage) List() []event.Event {
return []event.Event{}
}
func (s Storage) Get(id string) (event.Event, bool) {
func (s *Storage) Get(id string) (event.Event, bool) {
return event.Event{}, false
}

6
hw12_13_14_15_calendar/src/storage/store.go
View File

@ -7,7 +7,7 @@ import (
sqlstorage "github.com/tiburon-777/HW_OTUS/hw12_13_14_15_calendar/src/storage/sql"
)
type StoreInterface interface {
type Interface interface {
Save(event event.Event) error
Update(event event.Event) error
Delete(event event.Event) error
@ -15,8 +15,8 @@ type StoreInterface interface {
Get(id string) (event.Event, bool)
}
func NewStore(config config.Config) StoreInterface {
if config.Storage.In_memory {
func NewStore(config config.Config) Interface {
if config.Storage.InMemory {
st := memorystorage.New()
return st
}