Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkg/sql/delayed_mysql.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ type DelayedMySQLPublisherConfig struct {
OverridePublisherConfig func(config *PublisherConfig) error

Logger watermill.LoggerAdapter

// DisableInitializeSchema option disables auto initializing schema
DisableInitializeSchema bool
}

func (c *DelayedMySQLPublisherConfig) setDefaults() {
Expand All @@ -36,7 +39,7 @@ func NewDelayedMySQLPublisher(db ContextExecutor, config DelayedMySQLPublisherCo
SchemaAdapter: delayedMySQLSchemaAdapter{
MySQLQueueSchema: MySQLQueueSchema{},
},
AutoInitializeSchema: true,
AutoInitializeSchema: !config.DisableInitializeSchema,
}

if config.OverridePublisherConfig != nil {
Expand Down Expand Up @@ -75,6 +78,9 @@ type DelayedMySQLSubscriberConfig struct {
AllowNoDelay bool

Logger watermill.LoggerAdapter

// DisableInitializeSchema option disables auto initializing schema
DisableInitializeSchema bool
}

func (c *DelayedMySQLSubscriberConfig) setDefaults() {
Expand Down Expand Up @@ -107,7 +113,7 @@ func NewDelayedMySQLSubscriber(db Beginner, config DelayedMySQLSubscriberConfig)
OffsetsAdapter: MySQLQueueOffsetsAdapter{
DeleteOnAck: config.DeleteOnAck,
},
InitializeSchema: true,
InitializeSchema: !config.DisableInitializeSchema,
}

if config.OverrideSubscriberConfig != nil {
Expand Down
10 changes: 8 additions & 2 deletions pkg/sql/delayed_postgresql.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ type DelayedPostgreSQLPublisherConfig struct {
OverridePublisherConfig func(config *PublisherConfig) error

Logger watermill.LoggerAdapter

// DisableInitializeSchema option disables auto initializing schema
DisableInitializeSchema bool
}

func (c *DelayedPostgreSQLPublisherConfig) setDefaults() {
Expand All @@ -32,7 +35,7 @@ func NewDelayedPostgreSQLPublisher(db ContextExecutor, config DelayedPostgreSQLP

publisherConfig := PublisherConfig{
SchemaAdapter: PostgreSQLQueueSchema{},
AutoInitializeSchema: true,
AutoInitializeSchema: !config.DisableInitializeSchema,
}

if config.OverridePublisherConfig != nil {
Expand Down Expand Up @@ -71,6 +74,9 @@ type DelayedPostgreSQLSubscriberConfig struct {
AllowNoDelay bool

Logger watermill.LoggerAdapter

// DisableInitializeSchema option disables auto initializing schema
DisableInitializeSchema bool
}

func (c *DelayedPostgreSQLSubscriberConfig) setDefaults() {
Expand Down Expand Up @@ -103,7 +109,7 @@ func NewDelayedPostgreSQLSubscriber(db Beginner, config DelayedPostgreSQLSubscri
OffsetsAdapter: PostgreSQLQueueOffsetsAdapter{
DeleteOnAck: config.DeleteOnAck,
},
InitializeSchema: true,
InitializeSchema: !config.DisableInitializeSchema,
}

if config.OverrideSubscriberConfig != nil {
Expand Down
19 changes: 13 additions & 6 deletions pkg/sql/delayed_requeuer.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ type DelayedRequeuerConfig struct {
DelayOnError *middleware.DelayOnError

Logger watermill.LoggerAdapter

// DisableInitializeSchema option disables auto initializing schema
DisableInitializeSchema bool
}

func (c *DelayedRequeuerConfig) setDefaults() {
Expand Down Expand Up @@ -99,15 +102,17 @@ func NewPostgreSQLDelayedRequeuer(config DelayedRequeuerConfig) (*DelayedRequeue
}

publisher, err := NewDelayedPostgreSQLPublisher(config.DB, DelayedPostgreSQLPublisherConfig{
Logger: config.Logger,
Logger: config.Logger,
DisableInitializeSchema: config.DisableInitializeSchema,
})
if err != nil {
return nil, err
}

subscriber, err := NewDelayedPostgreSQLSubscriber(config.DB, DelayedPostgreSQLSubscriberConfig{
DeleteOnAck: true,
Logger: config.Logger,
DeleteOnAck: true,
Logger: config.Logger,
DisableInitializeSchema: config.DisableInitializeSchema,
})
if err != nil {
return nil, err
Expand Down Expand Up @@ -146,15 +151,17 @@ func NewMySQLDelayedRequeuer(config DelayedRequeuerConfig) (*DelayedRequeuer, er
}

publisher, err := NewDelayedMySQLPublisher(config.DB, DelayedMySQLPublisherConfig{
Logger: config.Logger,
Logger: config.Logger,
DisableInitializeSchema: config.DisableInitializeSchema,
})
if err != nil {
return nil, err
}

subscriber, err := NewDelayedMySQLSubscriber(config.DB, DelayedMySQLSubscriberConfig{
DeleteOnAck: true,
Logger: config.Logger,
DeleteOnAck: true,
Logger: config.Logger,
DisableInitializeSchema: config.DisableInitializeSchema,
})
if err != nil {
return nil, err
Expand Down
Loading