Add --data, --listen and --ports to byre serve for task previews
This commit is contained in:
+11
-9
@@ -15,27 +15,29 @@ import (
|
||||
"time"
|
||||
|
||||
"g.fc.run/misc/byre/internal/server"
|
||||
"g.fc.run/misc/byre/internal/store"
|
||||
"g.fc.run/misc/byre/web"
|
||||
)
|
||||
|
||||
const listenAddr = "127.0.0.1:8270"
|
||||
|
||||
func serveCmd(args []string) {
|
||||
flags := flag.NewFlagSet("serve", flag.ExitOnError)
|
||||
dev := flags.Bool("dev", false, "serve the SPA from ./web on disk instead of the embedded copy")
|
||||
flags.Parse(args)
|
||||
|
||||
configDir, err := os.UserConfigDir()
|
||||
if err != nil {
|
||||
fatal("user config dir", "err", err)
|
||||
}
|
||||
|
||||
flags := flag.NewFlagSet("serve", flag.ExitOnError)
|
||||
dev := flags.Bool("dev", false, "serve the SPA from ./web on disk instead of the embedded copy")
|
||||
dataDir := flags.String("data", filepath.Join(configDir, "byre"), "directory holding byre's database, worktrees, leads and blobs")
|
||||
listenAddr := flags.String("listen", "127.0.0.1:8270", "address to listen on")
|
||||
ports := flags.Int("ports", store.DefaultPortFirst, "first port of the tasks' port blocks")
|
||||
flags.Parse(args)
|
||||
|
||||
spa := fs.FS(web.FS)
|
||||
if *dev {
|
||||
spa = os.DirFS("web")
|
||||
}
|
||||
|
||||
srv, err := server.New(filepath.Join(configDir, "byre"), spa)
|
||||
srv, err := server.New(*dataDir, *ports, spa)
|
||||
if err != nil {
|
||||
fatal("start server", "err", err)
|
||||
}
|
||||
@@ -45,7 +47,7 @@ func serveCmd(args []string) {
|
||||
defer stop()
|
||||
|
||||
hs := &http.Server{
|
||||
Addr: listenAddr,
|
||||
Addr: *listenAddr,
|
||||
Handler: srv.Handler(),
|
||||
BaseContext: func(net.Listener) context.Context { return ctx },
|
||||
}
|
||||
@@ -57,7 +59,7 @@ func serveCmd(args []string) {
|
||||
hs.Shutdown(shutdownCtx)
|
||||
}()
|
||||
|
||||
slog.Info("listening", "addr", listenAddr, "dev", *dev)
|
||||
slog.Info("listening", "addr", *listenAddr, "data", *dataDir, "ports", *ports, "dev", *dev)
|
||||
err = hs.ListenAndServe()
|
||||
if !errors.Is(err, http.ErrServerClosed) {
|
||||
fatal("serve", "err", err)
|
||||
|
||||
Reference in New Issue
Block a user