Add --data, --listen and --ports to byre serve for task previews
This commit is contained in:
+10
-9
@@ -274,18 +274,19 @@ ALTER TABLE tasks ADD COLUMN merge_queued_at TEXT NOT NULL DEFAULT '';
|
||||
`}}
|
||||
|
||||
const (
|
||||
PortFirst = 41000
|
||||
PortBlock = 10
|
||||
DefaultPortFirst = 41000
|
||||
PortBlock = 10
|
||||
)
|
||||
|
||||
type Store struct {
|
||||
db *sql.DB
|
||||
path string
|
||||
writeMu sync.Mutex
|
||||
onEvent func(api.Event)
|
||||
db *sql.DB
|
||||
path string
|
||||
portFirst int
|
||||
writeMu sync.Mutex
|
||||
onEvent func(api.Event)
|
||||
}
|
||||
|
||||
func Open(path string, onEvent func(api.Event)) (*Store, error) {
|
||||
func Open(path string, portFirst int, onEvent func(api.Event)) (*Store, error) {
|
||||
dsn := "file:" + path + "?_pragma=journal_mode(WAL)&_pragma=busy_timeout(5000)&_pragma=foreign_keys(1)&_txlock=immediate"
|
||||
db, err := sql.Open("sqlite", dsn)
|
||||
if err != nil {
|
||||
@@ -298,7 +299,7 @@ func Open(path string, onEvent func(api.Event)) (*Store, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &Store{db: db, path: path, onEvent: onEvent}, nil
|
||||
return &Store{db: db, path: path, portFirst: portFirst, onEvent: onEvent}, nil
|
||||
}
|
||||
|
||||
func migrate(db *sql.DB, migrations []migration) error {
|
||||
@@ -557,7 +558,7 @@ func (s *Store) CreateTask(ctx context.Context, t api.Task, actor string) error
|
||||
SELECT ? AS candidate
|
||||
UNION ALL SELECT port_base + ? FROM tasks WHERE status = ?
|
||||
) WHERE candidate NOT IN (SELECT port_base FROM tasks WHERE status = ?)
|
||||
`, PortFirst, PortBlock, string(api.TaskStatusActive), string(api.TaskStatusActive)).Scan(&t.PortBase)
|
||||
`, s.portFirst, PortBlock, string(api.TaskStatusActive), string(api.TaskStatusActive)).Scan(&t.PortBase)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user