diff --git a/client.go b/client.go index afeeb293..766297d6 100644 --- a/client.go +++ b/client.go @@ -18,10 +18,10 @@ import ( "github.com/riverqueue/river/internal/jobcompleter" "github.com/riverqueue/river/internal/leadership" "github.com/riverqueue/river/internal/maintenance" - "github.com/riverqueue/river/internal/maintenance/startstop" "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" diff --git a/client_monitor.go b/client_monitor.go index cdff6b2a..0f65033f 100644 --- a/client_monitor.go +++ b/client_monitor.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/riverqueue/river/internal/componentstatus" - "github.com/riverqueue/river/internal/maintenance/startstop" + "github.com/riverqueue/river/internal/startstop" ) type clientMonitor struct { diff --git a/internal/jobcompleter/job_completer.go b/internal/jobcompleter/job_completer.go index c1a0e278..d1c2ca36 100644 --- a/internal/jobcompleter/job_completer.go +++ b/internal/jobcompleter/job_completer.go @@ -10,7 +10,7 @@ import ( "github.com/riverqueue/river/internal/baseservice" "github.com/riverqueue/river/internal/jobstats" - "github.com/riverqueue/river/internal/maintenance/startstop" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/sliceutil" "github.com/riverqueue/river/riverdriver" "github.com/riverqueue/river/rivertype" diff --git a/internal/jobcompleter/job_completer_test.go b/internal/jobcompleter/job_completer_test.go index 96e9b67a..b731e4a9 100644 --- a/internal/jobcompleter/job_completer_test.go +++ b/internal/jobcompleter/job_completer_test.go @@ -13,10 +13,10 @@ import ( "github.com/stretchr/testify/require" "github.com/riverqueue/river/internal/jobstats" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" "github.com/riverqueue/river/internal/riverinternaltest" "github.com/riverqueue/river/internal/riverinternaltest/testfactory" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/ptrutil" "github.com/riverqueue/river/riverdriver" "github.com/riverqueue/river/riverdriver/riverpgxv5" diff --git a/internal/leadership/elector.go b/internal/leadership/elector.go index c378fba0..5c5bc34b 100644 --- a/internal/leadership/elector.go +++ b/internal/leadership/elector.go @@ -9,9 +9,9 @@ import ( "time" "github.com/riverqueue/river/internal/baseservice" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/notifier" "github.com/riverqueue/river/internal/rivercommon" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/dbutil" "github.com/riverqueue/river/internal/util/valutil" "github.com/riverqueue/river/riverdriver" diff --git a/internal/maintenance/job_cleaner.go b/internal/maintenance/job_cleaner.go index 676c6026..66e1d548 100644 --- a/internal/maintenance/job_cleaner.go +++ b/internal/maintenance/job_cleaner.go @@ -8,8 +8,8 @@ import ( "time" "github.com/riverqueue/river/internal/baseservice" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/timeutil" "github.com/riverqueue/river/internal/util/valutil" "github.com/riverqueue/river/riverdriver" diff --git a/internal/maintenance/job_rescuer.go b/internal/maintenance/job_rescuer.go index 08d6f6fe..1368a4f9 100644 --- a/internal/maintenance/job_rescuer.go +++ b/internal/maintenance/job_rescuer.go @@ -9,8 +9,8 @@ import ( "time" "github.com/riverqueue/river/internal/baseservice" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/ptrutil" "github.com/riverqueue/river/internal/util/timeutil" "github.com/riverqueue/river/internal/util/valutil" diff --git a/internal/maintenance/job_scheduler.go b/internal/maintenance/job_scheduler.go index ac7a4888..d946646d 100644 --- a/internal/maintenance/job_scheduler.go +++ b/internal/maintenance/job_scheduler.go @@ -8,8 +8,8 @@ import ( "time" "github.com/riverqueue/river/internal/baseservice" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/timeutil" "github.com/riverqueue/river/internal/util/valutil" "github.com/riverqueue/river/riverdriver" diff --git a/internal/maintenance/periodic_job_enqueuer.go b/internal/maintenance/periodic_job_enqueuer.go index f27642cb..ab6dc81b 100644 --- a/internal/maintenance/periodic_job_enqueuer.go +++ b/internal/maintenance/periodic_job_enqueuer.go @@ -9,8 +9,8 @@ import ( "github.com/riverqueue/river/internal/baseservice" "github.com/riverqueue/river/internal/dbunique" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/maputil" "github.com/riverqueue/river/riverdriver" "github.com/riverqueue/river/rivertype" diff --git a/internal/maintenance/periodic_job_enqueuer_test.go b/internal/maintenance/periodic_job_enqueuer_test.go index a068073d..5cead754 100644 --- a/internal/maintenance/periodic_job_enqueuer_test.go +++ b/internal/maintenance/periodic_job_enqueuer_test.go @@ -11,10 +11,10 @@ import ( "github.com/stretchr/testify/require" "github.com/riverqueue/river/internal/dbunique" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" "github.com/riverqueue/river/internal/riverinternaltest" "github.com/riverqueue/river/internal/riverinternaltest/startstoptest" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/randutil" "github.com/riverqueue/river/riverdriver" "github.com/riverqueue/river/riverdriver/riverpgxv5" diff --git a/internal/maintenance/queue_cleaner.go b/internal/maintenance/queue_cleaner.go index f484b457..1d2bf83f 100644 --- a/internal/maintenance/queue_cleaner.go +++ b/internal/maintenance/queue_cleaner.go @@ -9,8 +9,8 @@ import ( "time" "github.com/riverqueue/river/internal/baseservice" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/timeutil" "github.com/riverqueue/river/internal/util/valutil" "github.com/riverqueue/river/riverdriver" diff --git a/internal/maintenance/queue_maintainer.go b/internal/maintenance/queue_maintainer.go index 820a97d4..a4f77f51 100644 --- a/internal/maintenance/queue_maintainer.go +++ b/internal/maintenance/queue_maintainer.go @@ -6,7 +6,7 @@ import ( "time" "github.com/riverqueue/river/internal/baseservice" - "github.com/riverqueue/river/internal/maintenance/startstop" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/maputil" ) diff --git a/internal/maintenance/queue_maintainer_test.go b/internal/maintenance/queue_maintainer_test.go index 21496248..858ab019 100644 --- a/internal/maintenance/queue_maintainer_test.go +++ b/internal/maintenance/queue_maintainer_test.go @@ -10,11 +10,11 @@ import ( "github.com/riverqueue/river/internal/baseservice" "github.com/riverqueue/river/internal/dbunique" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" "github.com/riverqueue/river/internal/riverinternaltest" "github.com/riverqueue/river/internal/riverinternaltest/sharedtx" "github.com/riverqueue/river/internal/riverinternaltest/startstoptest" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/riverdriver" "github.com/riverqueue/river/riverdriver/riverpgxv5" ) diff --git a/internal/maintenance/reindexer.go b/internal/maintenance/reindexer.go index a5cfeef9..f4776a33 100644 --- a/internal/maintenance/reindexer.go +++ b/internal/maintenance/reindexer.go @@ -7,8 +7,8 @@ import ( "time" "github.com/riverqueue/river/internal/baseservice" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/rivercommon" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/valutil" "github.com/riverqueue/river/riverdriver" ) diff --git a/internal/notifier/notifier.go b/internal/notifier/notifier.go index 1a66d9f4..47f873a4 100644 --- a/internal/notifier/notifier.go +++ b/internal/notifier/notifier.go @@ -10,8 +10,8 @@ import ( "github.com/riverqueue/river/internal/baseservice" "github.com/riverqueue/river/internal/componentstatus" - "github.com/riverqueue/river/internal/maintenance/startstop" "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/sliceutil" "github.com/riverqueue/river/riverdriver" diff --git a/internal/riverinternaltest/startstoptest/startstoptest.go b/internal/riverinternaltest/startstoptest/startstoptest.go index b9ad988c..3eff0d66 100644 --- a/internal/riverinternaltest/startstoptest/startstoptest.go +++ b/internal/riverinternaltest/startstoptest/startstoptest.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/riverqueue/river/internal/maintenance/startstop" + "github.com/riverqueue/river/internal/startstop" ) // Stress is a test helper that puts stress on a service's start and stop diff --git a/internal/riverinternaltest/startstoptest/startstoptest_test.go b/internal/riverinternaltest/startstoptest/startstoptest_test.go index 1c7e66b7..4b754ae6 100644 --- a/internal/riverinternaltest/startstoptest/startstoptest_test.go +++ b/internal/riverinternaltest/startstoptest/startstoptest_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/riverinternaltest" + "github.com/riverqueue/river/internal/startstop" ) type MyService struct { diff --git a/internal/maintenance/startstop/start_stop.go b/internal/startstop/start_stop.go similarity index 100% rename from internal/maintenance/startstop/start_stop.go rename to internal/startstop/start_stop.go diff --git a/internal/maintenance/startstop/start_stop_test.go b/internal/startstop/start_stop_test.go similarity index 100% rename from internal/maintenance/startstop/start_stop_test.go rename to internal/startstop/start_stop_test.go diff --git a/producer.go b/producer.go index 672a537a..1021e561 100644 --- a/producer.go +++ b/producer.go @@ -12,9 +12,9 @@ import ( "github.com/riverqueue/river/internal/baseservice" "github.com/riverqueue/river/internal/componentstatus" "github.com/riverqueue/river/internal/jobcompleter" - "github.com/riverqueue/river/internal/maintenance/startstop" "github.com/riverqueue/river/internal/notifier" "github.com/riverqueue/river/internal/rivercommon" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/chanutil" "github.com/riverqueue/river/internal/workunit" "github.com/riverqueue/river/riverdriver" diff --git a/subscription_manager.go b/subscription_manager.go index e273a904..67d863ff 100644 --- a/subscription_manager.go +++ b/subscription_manager.go @@ -9,7 +9,7 @@ import ( "github.com/riverqueue/river/internal/baseservice" "github.com/riverqueue/river/internal/jobcompleter" "github.com/riverqueue/river/internal/jobstats" - "github.com/riverqueue/river/internal/maintenance/startstop" + "github.com/riverqueue/river/internal/startstop" "github.com/riverqueue/river/internal/util/sliceutil" "github.com/riverqueue/river/rivertype" )