projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c2c538b
)
these errors are fatal for now, and fix them, RT#83146, RT#40206
author
Ivan Kohler
<ivan@freeside.biz>
Thu, 29 Aug 2019 22:34:28 +0000
(15:34 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Thu, 29 Aug 2019 22:34:28 +0000
(15:34 -0700)
FS/bin/freeside-cdr-asterisk_sql
patch
|
blob
|
history
diff --git
a/FS/bin/freeside-cdr-asterisk_sql
b/FS/bin/freeside-cdr-asterisk_sql
index
97e4758
..
cd765de
100755
(executable)
--- a/
FS/bin/freeside-cdr-asterisk_sql
+++ b/
FS/bin/freeside-cdr-asterisk_sql
@@
-133,9
+133,9
@@
while ( my $row = $sth->fetchrow_hashref ) {
$cdr->amaflags('') unless $cdr->amaflags =~ /^(\d+)$/;
if ( my $error = $cdr->insert ) {
$cdr->amaflags('') unless $cdr->amaflags =~ /^(\d+)$/;
if ( my $error = $cdr->insert ) {
- log_
msg
( error =>
- sprintf '
Non-fatal failure to import acct
id(%s) from table(%s): %s',
- $row->
acctid
,
+ log_
and_die
( error =>
+ sprintf '
Fatal failure to import unique
id(%s) from table(%s): %s',
+ $row->
{'uniqueid'}
,
$table,
$error
);
$table,
$error
);
@@
-161,9
+161,9
@@
while ( my $row = $sth->fetchrow_hashref ) {
if ( $dbi->do($usql, @args) ) {
$updates++;
} else {
if ( $dbi->do($usql, @args) ) {
$updates++;
} else {
- log_
msg
( error =>
- sprintf '
Non-fatal failure set status(done) acct
id(%s) table(%s): %s',
- $row->
acctid
,
+ log_
and_die
( error =>
+ sprintf '
Fatal failure set status(done) unique
id(%s) table(%s): %s',
+ $row->
{'uniqueid'}
,
$table,
$dbi->errstr
);
$table,
$dbi->errstr
);