diff options
| -rw-r--r-- | cmd/server/main.go | 8 | ||||
| -rw-r--r-- | internal/server/server.go | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/cmd/server/main.go b/cmd/server/main.go index f77c0a2..8d8d4d4 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -26,13 +26,7 @@ func main() { log := log.Configure(!runtimeConfig.Development) if runtimeConfig.Development { - tmpdir, err := os.MkdirTemp("", "website") - if err != nil { - log.Fatal("could not create temporary directory", "error", err) - } - log.Info("using temporary directory", "dir", tmpdir) - defer os.RemoveAll(tmpdir) - runtimeConfig.Root = tmpdir + runtimeConfig.DBPath = ":memory:" } sv, err := server.New(&runtimeConfig, log) diff --git a/internal/server/server.go b/internal/server/server.go index 28d44c4..0f5e22f 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -30,7 +30,6 @@ var ( type Config struct { DBPath string `conf:"default:site.db"` - Root string `conf:"default:public"` Redirect bool `conf:"default:true"` ListenAddress string `conf:"default:localhost"` Port int `conf:"default:8080,short:p"` @@ -97,7 +96,6 @@ func rebuild(builderConfig *builder.IOConfig, config *cfg.Config, log *log.Logge func New(runtimeConfig *Config, log *log.Logger) (*Server, error) { builderConfig := &builder.IOConfig{ - Destination: runtimeConfig.Root, Development: runtimeConfig.Development, } @@ -147,7 +145,7 @@ func New(runtimeConfig *Config, log *log.Logger) (*Server, error) { loggingMux := http.NewServeMux() - log.Debug("registering content files", "root", runtimeConfig.Root) + log.Debug("creating reader") reader, err := sqlite.NewReader(runtimeConfig.DBPath, log.Named("sqlite")) if err != nil { return nil, errors.WithMessage(err, "could not create sqlite reader") |