Skip to content

Commit

Permalink
Move parts of the project over to rivershared
Browse files Browse the repository at this point in the history
As discussed over Slack, we've been having trouble wherein we often find
ourselves needing pieces of the main River Go project over in other
projects like River UI, and having to copy a bunch of stuff over.

Here, we establish a new `rivershared` repository in [1], then move
references to it in the main repository over.

Basically my methodology for this one is that I'd been working on the
plugin system, wanted to see if `startstop.Service` could be moved so we
didn't have to duplicate it in `rivertype`, moved it to `rivershared`,
then moved all of its dependencies over to `rivershared` as well. (Most
of these dependencies come from `startstop`'s test suite.)

[1] https://github.com/riverqueue/rivershared/pull/1
  • Loading branch information
brandur committed Jul 7, 2024
1 parent d4ffd83 commit da5ebb6
Show file tree
Hide file tree
Showing 95 changed files with 360 additions and 2,228 deletions.
12 changes: 6 additions & 6 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"sync"
"time"

"github.com/riverqueue/river/internal/baseservice"
"github.com/riverqueue/river/internal/componentstatus"
"github.com/riverqueue/river/internal/dblist"
"github.com/riverqueue/river/internal/dbunique"
Expand All @@ -22,14 +21,15 @@ import (
"github.com/riverqueue/river/internal/notifier"
"github.com/riverqueue/river/internal/notifylimiter"
"github.com/riverqueue/river/internal/rivercommon"
"github.com/riverqueue/river/internal/startstop"
"github.com/riverqueue/river/internal/util/maputil"
"github.com/riverqueue/river/internal/util/randutil"
"github.com/riverqueue/river/internal/util/sliceutil"
"github.com/riverqueue/river/internal/util/valutil"
"github.com/riverqueue/river/internal/workunit"
"github.com/riverqueue/river/riverdriver"
"github.com/riverqueue/river/rivertype"
"github.com/riverqueue/rivershared/baseservice"
"github.com/riverqueue/rivershared/startstop"
"github.com/riverqueue/rivershared/util/maputil"
"github.com/riverqueue/rivershared/util/randutil"
"github.com/riverqueue/rivershared/util/sliceutil"
"github.com/riverqueue/rivershared/util/valutil"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion client_monitor.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sync"

"github.com/riverqueue/river/internal/componentstatus"
"github.com/riverqueue/river/internal/startstop"
"github.com/riverqueue/rivershared/startstop"
)

type clientMonitor struct {
Expand Down
2 changes: 1 addition & 1 deletion client_monitor_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"github.com/riverqueue/river/internal/componentstatus"
"github.com/riverqueue/river/internal/riverinternaltest"
"github.com/riverqueue/river/internal/riverinternaltest/startstoptest"
"github.com/riverqueue/rivershared/startstoptest"
)

func Test_Monitor_Stop(t *testing.T) {
Expand Down
Loading

0 comments on commit da5ebb6

Please sign in to comment.