From f6baf825d082f4afd2b3cab2cfd22efc7d39c85d Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Tue, 10 Sep 2019 16:37:14 +0200 Subject: [PATCH] TT#64978 per-stream filesequence for cdr/intcdr/event export to prevent a conflict when saving file sequence numbers for both cdr and intcdr export when using streams, the accounting.mark.collector name will be prefixed with the exporter type. Change-Id: I939c7bee59676b5d64967a7d57b1ed515cc80506 --- NGCP/CDR/Exporter.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NGCP/CDR/Exporter.pm b/NGCP/CDR/Exporter.pm index 5ecb233..909b761 100644 --- a/NGCP/CDR/Exporter.pm +++ b/NGCP/CDR/Exporter.pm @@ -661,7 +661,7 @@ sub write_wrap { } if (!defined($mark{"lastseq".$reseller_contract_id})) { my $tmpmark = NGCP::CDR::Export::get_mark($dbh, - ($stream eq 'default' ? $exporter_type : $stream), $mark_query); + ($stream eq 'default' ? $exporter_type : ($exporter_type . '-' . $stream)), $mark_query); %mark = ( %mark, %$tmpmark ); $mark{"lastseq".$reseller_contract_id} //= 0; } @@ -743,7 +743,7 @@ sub write_wrap { } } $mark{"lastseq".$reseller_contract_id} = $file_idx; - NGCP::CDR::Export::set_mark($dbh, ($stream eq 'default' ? $exporter_type : $stream), + NGCP::CDR::Export::set_mark($dbh, ($stream eq 'default' ? $exporter_type : ($exporter_type . '-' . $stream)), { "lastseq$reseller_contract_id" => $file_idx }); close($fh); }