employer
/
liza
1
0
Fork 0
Code Releases Activity

[DEV-5312] Update avro schema error context so invalid path is not overwritten

master
Austin Schaffer 2019-12-18 09:43:14 -05:00
parent c64ecbc816
commit b9f05b174f
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/system/DeltaProcessor.ts
View File

@ -22,7 +22,7 @@
import { DeltaDao } from '../system/db/DeltaDao';
import { DocumentMeta } from '../document/Document';
import { AmqpPublisher } from './AmqpPublisher';
import { context } from '../error/ContextError';
import { context, hasContext } from '../error/ContextError';
import { EventEmitter } from 'events';
import {
DeltaType,
@ -133,15 +133,23 @@ export class DeltaProcessor
} )
.catch( ( e: Error ) =>
{
const context_error = context(
e,
{
doc_id: meta.id,
quote_id: meta.id,
},
);
if ( hasContext( e ) )
{
const combined_context: Record<string, any> = {};
const error_context = e.context;
this._emitter.emit( 'error', context_error );
Object.keys( error_context ).forEach( ( key: string ) =>
{
combined_context[ key ] = error_context[ key ];
} );
combined_context[ 'doc_id' ] = meta.id;
combined_context[ 'quote_id' ] = meta.id;
e = context( e, combined_context );
}
this._emitter.emit( 'error', e );
return this._dao.setErrorFlag( meta.id );
} );
}

3
src/system/DeltaPublisher.ts
View File

@ -119,7 +119,8 @@ export class DeltaPublisher implements AmqpPublisher
{
doc_id: meta.id,
quote_id: meta.id,
delta: delta,
type: delta.type,
delta_ts: delta.timestamp,
exchange: this._conn.getExchangeName(),
}
);