diff options
author | r <r@freesoftwareextremist.com> | 2021-01-30 04:13:22 +0000 |
---|---|---|
committer | r <r@freesoftwareextremist.com> | 2021-01-30 04:13:22 +0000 |
commit | 9f34b607498c09b4a21bdcc82b3295f6c94bd058 (patch) | |
tree | c5a528cad05227f15f30b07f6d0056045176166b /main.go | |
parent | c3f39210d8451d65f3ecaa88046380f42dc536a1 (diff) | |
parent | 3ac95ab3b117ee8867a30c8e4b30ab37411e5ccf (diff) | |
download | bloat-9f34b607498c09b4a21bdcc82b3295f6c94bd058.tar.gz bloat-9f34b607498c09b4a21bdcc82b3295f6c94bd058.zip |
Merge branch 'master' into absolute_fluoride
Diffstat (limited to 'main.go')
-rw-r--r-- | main.go | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -12,7 +12,6 @@ import ( "time" "bloat/config" - "bloat/kv" "bloat/renderer" "bloat/repo" "bloat/service" @@ -76,13 +75,13 @@ func main() { } sessionDBPath := filepath.Join(config.DatabasePath, "session") - sessionDB, err := kv.NewDatabse(sessionDBPath) + sessionDB, err := util.NewDatabse(sessionDBPath) if err != nil { errExit(err) } appDBPath := filepath.Join(config.DatabasePath, "app") - appDB, err := kv.NewDatabse(appDBPath) + appDB, err := util.NewDatabse(appDBPath) if err != nil { errExit(err) } @@ -114,9 +113,7 @@ func main() { s := service.NewService(config.ClientName, config.ClientScope, config.ClientWebsite, customCSS, config.PostFormats, renderer, sessionRepo, appRepo, config.SingleInstance) - s = service.NewAuthService(sessionRepo, appRepo, s) - s = service.NewLoggingService(logger, s) - handler := service.NewHandler(s, config.StaticDirectory) + handler := service.NewHandler(s, logger, config.StaticDirectory) logger.Println("listening on", config.ListenAddress) err = http.ListenAndServe(config.ListenAddress, handler) |