🐛 Fixed bad branch rebasing
This commit is contained in:
parent
bf6efcdf21
commit
48a2f519f5
10
main.go
10
main.go
|
@ -88,15 +88,17 @@ func main() {
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
themeDir := os.DirFS(config.ThemeDir)
|
themeDir := os.DirFS(config.ThemeDir)
|
||||||
|
|
||||||
themes, err := themefsrepo.NewFileSystemThemeRepository(themeDir)
|
themes, err := themefsrepo.NewFileSystemThemeRepository(themeDir)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Fatalln(err)
|
logger.Fatalln(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
contentDir := os.DirFS(config.ContentDir)
|
||||||
|
|
||||||
statics := staticfsrepo.NewFileServerStaticRepository(contentDir)
|
statics := staticfsrepo.NewFileServerStaticRepository(contentDir)
|
||||||
staticer := staticucase.NewStaticUseCase(statics)
|
staticer := staticucase.NewStaticUseCase(statics)
|
||||||
|
|
||||||
themes := themefsrepo.NewFileSystemThemeRepository(themeDir)
|
|
||||||
themer := themeucase.NewThemeUseCase(themes)
|
themer := themeucase.NewThemeUseCase(themes)
|
||||||
|
|
||||||
sites := sitefsrepo.NewFileSystemSiteRepository(contentDir)
|
sites := sitefsrepo.NewFileSystemSiteRepository(contentDir)
|
||||||
|
@ -105,6 +107,8 @@ func main() {
|
||||||
pages := pagefsrepo.NewFileSystemPageRepository(contentDir)
|
pages := pagefsrepo.NewFileSystemPageRepository(contentDir)
|
||||||
pager := pageucase.NewPageUseCase(pages, statics)
|
pager := pageucase.NewPageUseCase(pages, statics)
|
||||||
|
|
||||||
|
matcher := language.NewMatcher(message.DefaultCatalog.Languages())
|
||||||
|
|
||||||
server := &http.Server{
|
server := &http.Server{
|
||||||
Addr: config.AddrPort().String(),
|
Addr: config.AddrPort().String(),
|
||||||
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
@ -187,14 +191,14 @@ func main() {
|
||||||
go func(server *http.Server) {
|
go func(server *http.Server) {
|
||||||
logger.Printf("starting server on %d...", config.Port)
|
logger.Printf("starting server on %d...", config.Port)
|
||||||
|
|
||||||
if err := server.ListenAndServe(); err != nil {
|
if err = server.ListenAndServe(); err != nil {
|
||||||
logger.Fatalln("cannot listen and serve server:", err)
|
logger.Fatalln("cannot listen and serve server:", err)
|
||||||
}
|
}
|
||||||
}(server)
|
}(server)
|
||||||
|
|
||||||
<-done
|
<-done
|
||||||
|
|
||||||
if err := server.Shutdown(ctx); err != nil {
|
if err = server.Shutdown(ctx); err != nil {
|
||||||
logger.Fatalln("failed shutdown server:", err)
|
logger.Fatalln("failed shutdown server:", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user