mirror of
https://github.com/cgrates/cgrates.git
synced 2026-02-11 18:16:24 +05:00
Upgrade NATS driver version and implementation
Upgraded NATS server version in ansible role. upgraded go.mod nats version due to an issue caused by version mismatch between driver and server (uncertain). Increased amount of sleep in tests after starting a NATS server with jetstream enabled from 50ms to 100ms. ## *NatsER.Serve - Replaced ChanQueueSubscribe with QueueSubscribe for Core NATS consumer to handle the message processing directly. - Since QueueSubscribe is now used regardless of jetstream status, the message handler has been assigned to a separate variable that can be reused. - The message handler is now dealing with the message processing directly, therefore the select case listening for the channel which is feeding NATS messages can be removed together with the channel itself and the select. Currently, the goroutine within Serve only has to block until the rdrExit chan is closed. - Moved the resource check inside the handler right before starting the message processing goroutine. ## ers.getProcessedOptions - Renamed function from getProcessOptions to getProcessedOptions. - Initially, the EventExporterOpts struct was always initialized to be non-nil which meant exporting processed messages by the reader was always enabled by force. Function has been updated to initialize it only once when the first Processed option that was set is found. - Created init function for all types of opts structs to avoid repetition. ## *NatsEE.parseOpts - Renamed function from parseOpt to parseOpts. - Updated function to return early in case of nil opts struct to reduce nesting. - The nested jetstream status and maxwait conditions nil verification have been merged into one condition. - Handled the error coming from GetNatsOpts function. - NATS Subject assignment has been removed. It was redundant, since it had already been set from before this function was called. ## *NatsEE.Connect - Updated function to return early in case of non-nil nats.Conn value to reduce nesting. ## *NatsEE.ExportEvent - Use defer to release resources and RUnlock. ## *NatsEE.Close - Use defer to Unlock. - Update function to return early in case of nil nats.Conn value to reduce nesting. ## ees.GetNatsOpts - Chose switch over if else when parsing client certificate and keys opts. - Updated function to return the errors directly instead of assigning them to a separate variable right before returning. ## ers.GetNatsOpts - Passed the NATSROpts struct directly to the function. - Chose switch over if else when parsing client certificate and keys opts. - Updated function to return the errors directly instead of assigning them to a separate variable right before returning. Removed tab from commented natsJetStreamMaxWaitProcessed option value in config_defaults.go under ers section. Removed redundant NATS prefix from config.NATSROpts type field names. Added function in ers/lib_test.go to create a config file in /tmp based on a config string. Added integration test for ERs NATS.
This commit is contained in:
ionutboangiu
committed by
Dan Christian Bogos
Dan Christian Bogos
parent
5d75b0e096
commit
b1d68b6cfe
@@ -463,7 +463,7 @@ const CGRATES_CFG_JSON = `
|
||||
// "natsCertificateAuthorityProcessed": "", // the path to a custom certificate authority file( used by tls)
|
||||
// "natsClientCertificateProcessed": "", // the path to a client certificate( used by tls)
|
||||
// "natsClientKeyProcessed": "", // the path to a client key( used by tls)
|
||||
// "natsJetStreamMaxWaitProcessed": "5s ", // the maximum amount of time to wait for a response
|
||||
// "natsJetStreamMaxWaitProcessed": "5s", // the maximum amount of time to wait for a response
|
||||
},
|
||||
"tenant": "", // tenant used by import
|
||||
"timezone": "", // timezone for timestamps where not specified <""|UTC|Local|$IANA_TZ_DB>
|
||||
|
||||
@@ -621,7 +621,7 @@ func testCGRConfigReloadERs(t *testing.T) {
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
XMLRootPath: utils.StringPointer(utils.EmptyString),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -651,7 +651,7 @@ func testCGRConfigReloadERs(t *testing.T) {
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
XMLRootPath: utils.StringPointer(utils.EmptyString),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
@@ -2368,7 +2368,7 @@ func TestERSConfig(t *testing.T) {
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
XMLRootPath: utils.StringPointer(utils.EmptyString),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -5411,7 +5411,7 @@ func TestCgrCdfEventReader(t *testing.T) {
|
||||
KafkaOpts: &KafkaROpts{},
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
XMLRootPath: utils.StringPointer(utils.EmptyString),
|
||||
@@ -5524,7 +5524,7 @@ func TestCgrCfgEventReaderDefault(t *testing.T) {
|
||||
SQLOpts: &SQLROpts{},
|
||||
KafkaOpts: &KafkaROpts{},
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
252
config/erscfg.go
252
config/erscfg.go
@@ -313,88 +313,88 @@ func (awsROpts *AWSROpts) loadFromJSONCfg(jsnCfg *EventReaderOptsJson) (err erro
|
||||
}
|
||||
|
||||
type NATSROpts struct {
|
||||
NATSJetStream *bool
|
||||
NATSConsumerName *string
|
||||
NATSSubject *string
|
||||
NATSQueueID *string
|
||||
NATSJWTFile *string
|
||||
NATSSeedFile *string
|
||||
NATSCertificateAuthority *string
|
||||
NATSClientCertificate *string
|
||||
NATSClientKey *string
|
||||
NATSJetStreamMaxWait *time.Duration
|
||||
NATSJetStreamProcessed *bool
|
||||
NATSSubjectProcessed *string
|
||||
NATSJWTFileProcessed *string
|
||||
NATSSeedFileProcessed *string
|
||||
NATSCertificateAuthorityProcessed *string
|
||||
NATSClientCertificateProcessed *string
|
||||
NATSClientKeyProcessed *string
|
||||
NATSJetStreamMaxWaitProcessed *time.Duration
|
||||
JetStream *bool
|
||||
ConsumerName *string
|
||||
Subject *string
|
||||
QueueID *string
|
||||
JWTFile *string
|
||||
SeedFile *string
|
||||
CertificateAuthority *string
|
||||
ClientCertificate *string
|
||||
ClientKey *string
|
||||
JetStreamMaxWait *time.Duration
|
||||
JetStreamProcessed *bool
|
||||
SubjectProcessed *string
|
||||
JWTFileProcessed *string
|
||||
SeedFileProcessed *string
|
||||
CertificateAuthorityProcessed *string
|
||||
ClientCertificateProcessed *string
|
||||
ClientKeyProcessed *string
|
||||
JetStreamMaxWaitProcessed *time.Duration
|
||||
}
|
||||
|
||||
func (natsOpts *NATSROpts) loadFromJSONCfg(jsnCfg *EventReaderOptsJson) (err error) {
|
||||
if jsnCfg.NATSJetStream != nil {
|
||||
natsOpts.NATSJetStream = jsnCfg.NATSJetStream
|
||||
natsOpts.JetStream = jsnCfg.NATSJetStream
|
||||
}
|
||||
if jsnCfg.NATSConsumerName != nil {
|
||||
natsOpts.NATSConsumerName = jsnCfg.NATSConsumerName
|
||||
natsOpts.ConsumerName = jsnCfg.NATSConsumerName
|
||||
}
|
||||
if jsnCfg.NATSSubject != nil {
|
||||
natsOpts.NATSSubject = jsnCfg.NATSSubject
|
||||
natsOpts.Subject = jsnCfg.NATSSubject
|
||||
}
|
||||
if jsnCfg.NATSQueueID != nil {
|
||||
natsOpts.NATSQueueID = jsnCfg.NATSQueueID
|
||||
natsOpts.QueueID = jsnCfg.NATSQueueID
|
||||
}
|
||||
if jsnCfg.NATSJWTFile != nil {
|
||||
natsOpts.NATSJWTFile = jsnCfg.NATSJWTFile
|
||||
natsOpts.JWTFile = jsnCfg.NATSJWTFile
|
||||
}
|
||||
if jsnCfg.NATSSeedFile != nil {
|
||||
natsOpts.NATSSeedFile = jsnCfg.NATSSeedFile
|
||||
natsOpts.SeedFile = jsnCfg.NATSSeedFile
|
||||
}
|
||||
if jsnCfg.NATSCertificateAuthority != nil {
|
||||
natsOpts.NATSCertificateAuthority = jsnCfg.NATSCertificateAuthority
|
||||
natsOpts.CertificateAuthority = jsnCfg.NATSCertificateAuthority
|
||||
}
|
||||
if jsnCfg.NATSClientCertificate != nil {
|
||||
natsOpts.NATSClientCertificate = jsnCfg.NATSClientCertificate
|
||||
natsOpts.ClientCertificate = jsnCfg.NATSClientCertificate
|
||||
}
|
||||
if jsnCfg.NATSClientKey != nil {
|
||||
natsOpts.NATSClientKey = jsnCfg.NATSClientKey
|
||||
natsOpts.ClientKey = jsnCfg.NATSClientKey
|
||||
}
|
||||
if jsnCfg.NATSJetStreamMaxWait != nil {
|
||||
var jetStreamMaxWait time.Duration
|
||||
if jetStreamMaxWait, err = utils.ParseDurationWithNanosecs(*jsnCfg.NATSJetStreamMaxWait); err != nil {
|
||||
return
|
||||
}
|
||||
natsOpts.NATSJetStreamMaxWait = utils.DurationPointer(jetStreamMaxWait)
|
||||
natsOpts.JetStreamMaxWait = utils.DurationPointer(jetStreamMaxWait)
|
||||
}
|
||||
if jsnCfg.NATSJetStreamProcessed != nil {
|
||||
natsOpts.NATSJetStreamProcessed = jsnCfg.NATSJetStreamProcessed
|
||||
natsOpts.JetStreamProcessed = jsnCfg.NATSJetStreamProcessed
|
||||
}
|
||||
if jsnCfg.NATSSubjectProcessed != nil {
|
||||
natsOpts.NATSSubjectProcessed = jsnCfg.NATSSubjectProcessed
|
||||
natsOpts.SubjectProcessed = jsnCfg.NATSSubjectProcessed
|
||||
}
|
||||
if jsnCfg.NATSJWTFileProcessed != nil {
|
||||
natsOpts.NATSJWTFileProcessed = jsnCfg.NATSJWTFileProcessed
|
||||
natsOpts.JWTFileProcessed = jsnCfg.NATSJWTFileProcessed
|
||||
}
|
||||
if jsnCfg.NATSSeedFileProcessed != nil {
|
||||
natsOpts.NATSSeedFileProcessed = jsnCfg.NATSSeedFileProcessed
|
||||
natsOpts.SeedFileProcessed = jsnCfg.NATSSeedFileProcessed
|
||||
}
|
||||
if jsnCfg.NATSCertificateAuthorityProcessed != nil {
|
||||
natsOpts.NATSCertificateAuthorityProcessed = jsnCfg.NATSCertificateAuthorityProcessed
|
||||
natsOpts.CertificateAuthorityProcessed = jsnCfg.NATSCertificateAuthorityProcessed
|
||||
}
|
||||
if jsnCfg.NATSClientCertificateProcessed != nil {
|
||||
natsOpts.NATSClientCertificateProcessed = jsnCfg.NATSClientCertificateProcessed
|
||||
natsOpts.ClientCertificateProcessed = jsnCfg.NATSClientCertificateProcessed
|
||||
}
|
||||
if jsnCfg.NATSClientKeyProcessed != nil {
|
||||
natsOpts.NATSClientKeyProcessed = jsnCfg.NATSClientKeyProcessed
|
||||
natsOpts.ClientKeyProcessed = jsnCfg.NATSClientKeyProcessed
|
||||
}
|
||||
if jsnCfg.NATSJetStreamMaxWaitProcessed != nil {
|
||||
var jetStreamMaxWait time.Duration
|
||||
if jetStreamMaxWait, err = utils.ParseDurationWithNanosecs(*jsnCfg.NATSJetStreamMaxWaitProcessed); err != nil {
|
||||
return
|
||||
}
|
||||
natsOpts.NATSJetStreamMaxWaitProcessed = utils.DurationPointer(jetStreamMaxWait)
|
||||
natsOpts.JetStreamMaxWaitProcessed = utils.DurationPointer(jetStreamMaxWait)
|
||||
}
|
||||
return
|
||||
}
|
||||
@@ -761,77 +761,77 @@ func (awsOpt *AWSROpts) Clone() *AWSROpts {
|
||||
}
|
||||
func (natOpts *NATSROpts) Clone() *NATSROpts {
|
||||
cln := &NATSROpts{}
|
||||
if natOpts.NATSJetStream != nil {
|
||||
cln.NATSJetStream = new(bool)
|
||||
*cln.NATSJetStream = *natOpts.NATSJetStream
|
||||
if natOpts.JetStream != nil {
|
||||
cln.JetStream = new(bool)
|
||||
*cln.JetStream = *natOpts.JetStream
|
||||
}
|
||||
if natOpts.NATSConsumerName != nil {
|
||||
cln.NATSConsumerName = new(string)
|
||||
*cln.NATSConsumerName = *natOpts.NATSConsumerName
|
||||
if natOpts.ConsumerName != nil {
|
||||
cln.ConsumerName = new(string)
|
||||
*cln.ConsumerName = *natOpts.ConsumerName
|
||||
}
|
||||
if natOpts.NATSSubject != nil {
|
||||
cln.NATSSubject = new(string)
|
||||
*cln.NATSSubject = *natOpts.NATSSubject
|
||||
if natOpts.Subject != nil {
|
||||
cln.Subject = new(string)
|
||||
*cln.Subject = *natOpts.Subject
|
||||
}
|
||||
if natOpts.NATSQueueID != nil {
|
||||
cln.NATSQueueID = new(string)
|
||||
*cln.NATSQueueID = *natOpts.NATSQueueID
|
||||
if natOpts.QueueID != nil {
|
||||
cln.QueueID = new(string)
|
||||
*cln.QueueID = *natOpts.QueueID
|
||||
}
|
||||
if natOpts.NATSJWTFile != nil {
|
||||
cln.NATSJWTFile = new(string)
|
||||
*cln.NATSJWTFile = *natOpts.NATSJWTFile
|
||||
if natOpts.JWTFile != nil {
|
||||
cln.JWTFile = new(string)
|
||||
*cln.JWTFile = *natOpts.JWTFile
|
||||
}
|
||||
if natOpts.NATSSeedFile != nil {
|
||||
cln.NATSSeedFile = new(string)
|
||||
*cln.NATSSeedFile = *natOpts.NATSSeedFile
|
||||
if natOpts.SeedFile != nil {
|
||||
cln.SeedFile = new(string)
|
||||
*cln.SeedFile = *natOpts.SeedFile
|
||||
}
|
||||
if natOpts.NATSCertificateAuthority != nil {
|
||||
cln.NATSCertificateAuthority = new(string)
|
||||
*cln.NATSCertificateAuthority = *natOpts.NATSCertificateAuthority
|
||||
if natOpts.CertificateAuthority != nil {
|
||||
cln.CertificateAuthority = new(string)
|
||||
*cln.CertificateAuthority = *natOpts.CertificateAuthority
|
||||
}
|
||||
if natOpts.NATSClientCertificate != nil {
|
||||
cln.NATSClientCertificate = new(string)
|
||||
*cln.NATSClientCertificate = *natOpts.NATSClientCertificate
|
||||
if natOpts.ClientCertificate != nil {
|
||||
cln.ClientCertificate = new(string)
|
||||
*cln.ClientCertificate = *natOpts.ClientCertificate
|
||||
}
|
||||
if natOpts.NATSClientKey != nil {
|
||||
cln.NATSClientKey = new(string)
|
||||
*cln.NATSClientKey = *natOpts.NATSClientKey
|
||||
if natOpts.ClientKey != nil {
|
||||
cln.ClientKey = new(string)
|
||||
*cln.ClientKey = *natOpts.ClientKey
|
||||
}
|
||||
if natOpts.NATSJetStreamMaxWait != nil {
|
||||
cln.NATSJetStreamMaxWait = new(time.Duration)
|
||||
*cln.NATSJetStreamMaxWait = *natOpts.NATSJetStreamMaxWait
|
||||
if natOpts.JetStreamMaxWait != nil {
|
||||
cln.JetStreamMaxWait = new(time.Duration)
|
||||
*cln.JetStreamMaxWait = *natOpts.JetStreamMaxWait
|
||||
}
|
||||
if natOpts.NATSJetStreamProcessed != nil {
|
||||
cln.NATSJetStreamProcessed = new(bool)
|
||||
*cln.NATSJetStreamProcessed = *natOpts.NATSJetStreamProcessed
|
||||
if natOpts.JetStreamProcessed != nil {
|
||||
cln.JetStreamProcessed = new(bool)
|
||||
*cln.JetStreamProcessed = *natOpts.JetStreamProcessed
|
||||
}
|
||||
if natOpts.NATSSubjectProcessed != nil {
|
||||
cln.NATSSubjectProcessed = new(string)
|
||||
*cln.NATSSubjectProcessed = *natOpts.NATSSubjectProcessed
|
||||
if natOpts.SubjectProcessed != nil {
|
||||
cln.SubjectProcessed = new(string)
|
||||
*cln.SubjectProcessed = *natOpts.SubjectProcessed
|
||||
}
|
||||
if natOpts.NATSJWTFileProcessed != nil {
|
||||
cln.NATSJWTFileProcessed = new(string)
|
||||
*cln.NATSJWTFileProcessed = *natOpts.NATSJWTFileProcessed
|
||||
if natOpts.JWTFileProcessed != nil {
|
||||
cln.JWTFileProcessed = new(string)
|
||||
*cln.JWTFileProcessed = *natOpts.JWTFileProcessed
|
||||
}
|
||||
if natOpts.NATSSeedFileProcessed != nil {
|
||||
cln.NATSSeedFileProcessed = new(string)
|
||||
*cln.NATSSeedFileProcessed = *natOpts.NATSSeedFileProcessed
|
||||
if natOpts.SeedFileProcessed != nil {
|
||||
cln.SeedFileProcessed = new(string)
|
||||
*cln.SeedFileProcessed = *natOpts.SeedFileProcessed
|
||||
}
|
||||
if natOpts.NATSCertificateAuthorityProcessed != nil {
|
||||
cln.NATSCertificateAuthorityProcessed = new(string)
|
||||
*cln.NATSCertificateAuthorityProcessed = *natOpts.NATSCertificateAuthorityProcessed
|
||||
if natOpts.CertificateAuthorityProcessed != nil {
|
||||
cln.CertificateAuthorityProcessed = new(string)
|
||||
*cln.CertificateAuthorityProcessed = *natOpts.CertificateAuthorityProcessed
|
||||
}
|
||||
if natOpts.NATSClientCertificateProcessed != nil {
|
||||
cln.NATSClientCertificateProcessed = new(string)
|
||||
*cln.NATSClientCertificateProcessed = *natOpts.NATSClientCertificateProcessed
|
||||
if natOpts.ClientCertificateProcessed != nil {
|
||||
cln.ClientCertificateProcessed = new(string)
|
||||
*cln.ClientCertificateProcessed = *natOpts.ClientCertificateProcessed
|
||||
}
|
||||
if natOpts.NATSClientKeyProcessed != nil {
|
||||
cln.NATSClientKeyProcessed = new(string)
|
||||
*cln.NATSClientKeyProcessed = *natOpts.NATSClientKeyProcessed
|
||||
if natOpts.ClientKeyProcessed != nil {
|
||||
cln.ClientKeyProcessed = new(string)
|
||||
*cln.ClientKeyProcessed = *natOpts.ClientKeyProcessed
|
||||
}
|
||||
if natOpts.NATSJetStreamMaxWaitProcessed != nil {
|
||||
cln.NATSJetStreamMaxWaitProcessed = new(time.Duration)
|
||||
*cln.NATSJetStreamMaxWaitProcessed = *natOpts.NATSJetStreamMaxWaitProcessed
|
||||
if natOpts.JetStreamMaxWaitProcessed != nil {
|
||||
cln.JetStreamMaxWaitProcessed = new(time.Duration)
|
||||
*cln.JetStreamMaxWaitProcessed = *natOpts.JetStreamMaxWaitProcessed
|
||||
}
|
||||
return cln
|
||||
}
|
||||
@@ -1072,59 +1072,59 @@ func (er *EventReaderCfg) AsMapInterface(separator string) (initialMP map[string
|
||||
}
|
||||
|
||||
if natsOpts := er.Opts.NATSOpts; natsOpts != nil {
|
||||
if natsOpts.NATSJetStream != nil {
|
||||
opts[utils.NatsJetStream] = *natsOpts.NATSJetStream
|
||||
if natsOpts.JetStream != nil {
|
||||
opts[utils.NatsJetStream] = *natsOpts.JetStream
|
||||
}
|
||||
if natsOpts.NATSConsumerName != nil {
|
||||
opts[utils.NatsConsumerName] = *natsOpts.NATSConsumerName
|
||||
if natsOpts.ConsumerName != nil {
|
||||
opts[utils.NatsConsumerName] = *natsOpts.ConsumerName
|
||||
}
|
||||
if natsOpts.NATSSubject != nil {
|
||||
opts[utils.NatsSubject] = *natsOpts.NATSSubject
|
||||
if natsOpts.Subject != nil {
|
||||
opts[utils.NatsSubject] = *natsOpts.Subject
|
||||
}
|
||||
if natsOpts.NATSQueueID != nil {
|
||||
opts[utils.NatsQueueID] = *natsOpts.NATSQueueID
|
||||
if natsOpts.QueueID != nil {
|
||||
opts[utils.NatsQueueID] = *natsOpts.QueueID
|
||||
}
|
||||
if natsOpts.NATSJWTFile != nil {
|
||||
opts[utils.NatsJWTFile] = *natsOpts.NATSJWTFile
|
||||
if natsOpts.JWTFile != nil {
|
||||
opts[utils.NatsJWTFile] = *natsOpts.JWTFile
|
||||
}
|
||||
if natsOpts.NATSSeedFile != nil {
|
||||
opts[utils.NatsSeedFile] = *natsOpts.NATSSeedFile
|
||||
if natsOpts.SeedFile != nil {
|
||||
opts[utils.NatsSeedFile] = *natsOpts.SeedFile
|
||||
}
|
||||
if natsOpts.NATSCertificateAuthority != nil {
|
||||
opts[utils.NatsCertificateAuthority] = *natsOpts.NATSCertificateAuthority
|
||||
if natsOpts.CertificateAuthority != nil {
|
||||
opts[utils.NatsCertificateAuthority] = *natsOpts.CertificateAuthority
|
||||
}
|
||||
if natsOpts.NATSClientCertificate != nil {
|
||||
opts[utils.NatsClientCertificate] = *natsOpts.NATSClientCertificate
|
||||
if natsOpts.ClientCertificate != nil {
|
||||
opts[utils.NatsClientCertificate] = *natsOpts.ClientCertificate
|
||||
}
|
||||
if natsOpts.NATSClientKey != nil {
|
||||
opts[utils.NatsClientKey] = *natsOpts.NATSClientKey
|
||||
if natsOpts.ClientKey != nil {
|
||||
opts[utils.NatsClientKey] = *natsOpts.ClientKey
|
||||
}
|
||||
if natsOpts.NATSJetStreamMaxWait != nil {
|
||||
opts[utils.NatsJetStreamMaxWait] = natsOpts.NATSJetStreamMaxWait.String()
|
||||
if natsOpts.JetStreamMaxWait != nil {
|
||||
opts[utils.NatsJetStreamMaxWait] = natsOpts.JetStreamMaxWait.String()
|
||||
}
|
||||
if natsOpts.NATSJetStreamProcessed != nil {
|
||||
opts[utils.NATSJetStreamProcessedCfg] = *natsOpts.NATSJetStreamProcessed
|
||||
if natsOpts.JetStreamProcessed != nil {
|
||||
opts[utils.NATSJetStreamProcessedCfg] = *natsOpts.JetStreamProcessed
|
||||
}
|
||||
if natsOpts.NATSSubjectProcessed != nil {
|
||||
opts[utils.NATSSubjectProcessedCfg] = *natsOpts.NATSSubjectProcessed
|
||||
if natsOpts.SubjectProcessed != nil {
|
||||
opts[utils.NATSSubjectProcessedCfg] = *natsOpts.SubjectProcessed
|
||||
}
|
||||
if natsOpts.NATSJWTFileProcessed != nil {
|
||||
opts[utils.NATSJWTFileProcessedCfg] = *natsOpts.NATSJWTFileProcessed
|
||||
if natsOpts.JWTFileProcessed != nil {
|
||||
opts[utils.NATSJWTFileProcessedCfg] = *natsOpts.JWTFileProcessed
|
||||
}
|
||||
if natsOpts.NATSSeedFileProcessed != nil {
|
||||
opts[utils.NATSSeedFileProcessedCfg] = *natsOpts.NATSSeedFileProcessed
|
||||
if natsOpts.SeedFileProcessed != nil {
|
||||
opts[utils.NATSSeedFileProcessedCfg] = *natsOpts.SeedFileProcessed
|
||||
}
|
||||
if natsOpts.NATSCertificateAuthorityProcessed != nil {
|
||||
opts[utils.NATSCertificateAuthorityProcessedCfg] = *natsOpts.NATSCertificateAuthorityProcessed
|
||||
if natsOpts.CertificateAuthorityProcessed != nil {
|
||||
opts[utils.NATSCertificateAuthorityProcessedCfg] = *natsOpts.CertificateAuthorityProcessed
|
||||
}
|
||||
if natsOpts.NATSClientCertificateProcessed != nil {
|
||||
opts[utils.NATSClientCertificateProcessed] = *natsOpts.NATSClientCertificateProcessed
|
||||
if natsOpts.ClientCertificateProcessed != nil {
|
||||
opts[utils.NATSClientCertificateProcessed] = *natsOpts.ClientCertificateProcessed
|
||||
}
|
||||
if natsOpts.NATSClientKeyProcessed != nil {
|
||||
opts[utils.NATSClientKeyProcessedCfg] = *natsOpts.NATSClientKeyProcessed
|
||||
if natsOpts.ClientKeyProcessed != nil {
|
||||
opts[utils.NATSClientKeyProcessedCfg] = *natsOpts.ClientKeyProcessed
|
||||
}
|
||||
if natsOpts.NATSJetStreamMaxWaitProcessed != nil {
|
||||
opts[utils.NATSJetStreamMaxWaitProcessedCfg] = natsOpts.NATSJetStreamMaxWaitProcessed.String()
|
||||
if natsOpts.JetStreamMaxWaitProcessed != nil {
|
||||
opts[utils.NATSJetStreamMaxWaitProcessedCfg] = natsOpts.JetStreamMaxWaitProcessed.String()
|
||||
}
|
||||
}
|
||||
initialMP = map[string]any{
|
||||
|
||||
@@ -113,7 +113,7 @@ func TestERSClone(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -153,7 +153,7 @@ func TestERSClone(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -281,7 +281,7 @@ func TestERSLoadFromjsonCfg(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -336,7 +336,7 @@ func TestERSLoadFromjsonCfg(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -524,7 +524,7 @@ func TestERSloadFromJsonCase3(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -563,7 +563,7 @@ func TestERSloadFromJsonCase3(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -675,7 +675,7 @@ func TestERSloadFromJsonCase4(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -714,7 +714,7 @@ func TestERSloadFromJsonCase4(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -821,7 +821,7 @@ func TestEventReaderSameID(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -856,7 +856,7 @@ func TestEventReaderSameID(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1315,7 +1315,7 @@ func TestERsloadFromJsonCfg(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1356,7 +1356,7 @@ func TestERsloadFromJsonCfg(t *testing.T) {
|
||||
PartialOrderField: utils.StringPointer("~*req.AnswerTime"),
|
||||
PartialCacheAction: utils.StringPointer(utils.MetaNone),
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSSubject: utils.StringPointer("cgrates_cdrs"),
|
||||
Subject: utils.StringPointer("cgrates_cdrs"),
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -1539,23 +1539,23 @@ func TestEventReaderCfgClone(t *testing.T) {
|
||||
S3BucketIDProcessed: utils.StringPointer("S3BucketProc"),
|
||||
},
|
||||
NATSOpts: &NATSROpts{
|
||||
NATSJetStream: utils.BoolPointer(false),
|
||||
NATSConsumerName: utils.StringPointer("user"),
|
||||
NATSQueueID: utils.StringPointer("id"),
|
||||
NATSJWTFile: utils.StringPointer("jwt"),
|
||||
NATSSeedFile: utils.StringPointer("seed"),
|
||||
NATSCertificateAuthority: utils.StringPointer("authority"),
|
||||
NATSClientCertificate: utils.StringPointer("certificate"),
|
||||
NATSClientKey: utils.StringPointer("key5"),
|
||||
NATSJetStreamMaxWait: utils.DurationPointer(1 * time.Minute),
|
||||
NATSJetStreamProcessed: utils.BoolPointer(true),
|
||||
NATSJWTFileProcessed: utils.StringPointer("file"),
|
||||
NATSSeedFileProcessed: utils.StringPointer("natseed"),
|
||||
NATSCertificateAuthorityProcessed: utils.StringPointer("natsauth"),
|
||||
NATSClientCertificateProcessed: utils.StringPointer("natcertificate"),
|
||||
NATSClientKeyProcessed: utils.StringPointer("natsprocess"),
|
||||
NATSJetStreamMaxWaitProcessed: utils.DurationPointer(1 * time.Minute),
|
||||
NATSSubjectProcessed: utils.StringPointer("process"),
|
||||
JetStream: utils.BoolPointer(false),
|
||||
ConsumerName: utils.StringPointer("user"),
|
||||
QueueID: utils.StringPointer("id"),
|
||||
JWTFile: utils.StringPointer("jwt"),
|
||||
SeedFile: utils.StringPointer("seed"),
|
||||
CertificateAuthority: utils.StringPointer("authority"),
|
||||
ClientCertificate: utils.StringPointer("certificate"),
|
||||
ClientKey: utils.StringPointer("key5"),
|
||||
JetStreamMaxWait: utils.DurationPointer(1 * time.Minute),
|
||||
JetStreamProcessed: utils.BoolPointer(true),
|
||||
JWTFileProcessed: utils.StringPointer("file"),
|
||||
SeedFileProcessed: utils.StringPointer("natseed"),
|
||||
CertificateAuthorityProcessed: utils.StringPointer("natsauth"),
|
||||
ClientCertificateProcessed: utils.StringPointer("natcertificate"),
|
||||
ClientKeyProcessed: utils.StringPointer("natsprocess"),
|
||||
JetStreamMaxWaitProcessed: utils.DurationPointer(1 * time.Minute),
|
||||
SubjectProcessed: utils.StringPointer("process"),
|
||||
},
|
||||
KafkaOpts: &KafkaROpts{
|
||||
KafkaTopic: utils.StringPointer("kafka"),
|
||||
|
||||
Reference in New Issue
Block a user