26 Commits

Author SHA1 Message Date
ionutboangiu
8443af3a89 Relicense from GPLv3 to AGPLv3 2025-10-29 19:42:40 +01:00
ionutboangiu
c171937c3d Add WaitGroup to ensure safe file processing in ERs
For cases when run_delay > 0.
2025-01-21 19:30:33 +01:00
ionutboangiu
b9b07dc561 Remove redundant dir parameter from processFile methods
Applies to both file readers and loader (for loader, the blank statement
was used anyway).

It's redundant because for file readers, the rdr.dir value was always
passed as the parameter when it was already part of the method's object.

Parameter had to also be removed from the WatchDir function and the
functions it depends on.
2024-04-04 12:31:18 +03:00
ionutboangiu
85864ccaa3 Extract common dir processing logic to a func
It will be reused for all file readers.
Rename rdrDir field to dir (redundant prefix).
2024-04-04 12:31:18 +03:00
ionutboangiu
0aea8ac641 Revert "Move CGREvent from utils to engine"
This reverts commit 02195c47ed.
2024-03-04 09:49:15 +01:00
ionutboangiu
02195c47ed Move CGREvent from utils to engine 2024-02-27 17:16:57 +01:00
ionutboangiu
0c91933065 Revise ERs event exporting
Add ees_success_ids and ees_failed_ids fields in reader config. The
former will be used to set EeIDs when the event processing returns
no error, while the latter will be used otherwise.

Add config sanity checks for the added options.

Remove Processed opts and everything related to them since they should
not be used anymore.

Fixed test compilation errors caused by the change.
2023-11-29 16:21:51 +01:00
ionutboangiu
a80fe9b96e Remove redundant prefixes/suffixes from rOpts field names 2023-09-28 20:48:07 +02:00
ionutboangiu
b1d68b6cfe 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.
2023-09-26 21:29:52 +02:00
gezimbll
01d3c5d0fa Separating opts in ERS && fixing tests 2023-06-27 11:08:34 +02:00
gezimbll
1b1dd13677 Separating opts for each eventexporter type and fixing tests 2023-06-22 10:36:46 +02:00
ionutboangiu
6c16ff320f Replace interface{} with any 2023-05-31 10:23:12 +02:00
ionutboangiu
a7d2fc53e2 Add comment to getProcessOptions func 2023-03-08 19:13:04 +01:00
ionutboangiu
25e08ebe79 Add options for SASL PLAIN auth (amqp 1.0) 2023-02-22 18:20:33 +01:00
ionutboangiu
62e878574e Solve the remaining compilation errors and replace SSLMode with PgSSLMode 2022-07-12 17:59:09 +02:00
ionutboangiu
38447e9229 Make ers opts as struct and fix compilation errors 2021-11-29 20:57:39 +01:00
andronache
bcb564240e Corrected header in multiple files 2021-11-01 13:49:33 +02:00
Trial97
73de017591 Updated flatstore tests 2021-05-17 18:00:31 +02:00
Trial97
5105d3aa85 Updated ers config 2021-05-17 18:00:31 +02:00
Trial97
13cd8e8a99 Added lazyQuotes option for csv reader 2021-04-26 16:03:09 +02:00
Trial97
505f230b1e Added inotify support for loaders 2020-11-11 15:06:35 +01:00
Trial97
228665989e Updated ERs and EEs options 2020-09-04 12:32:09 +02:00
DanB
062547c83f CSVReader watchDir with own goroutines, NewERService not longer returning error on init 2019-09-04 12:24:25 +02:00
DanB
fc4cb76f38 ERService.processEvent implementation 2019-09-04 12:24:25 +02:00
DanB
76dc53a720 ers.processReader implementation 2019-09-01 20:59:38 +02:00
DanB
0229c6e90e ERs with one id per path implementation 2019-09-01 20:59:38 +02:00