Commit 8d90a3941f5d340bca2ef964ee8497b16e857cf1
1 parent
a332cb4bf5
Exists in
master
Add xid on messages-archives.insert
Showing 2 changed files with 9 additions and 8 deletions Side-by-side Diff
lib/http-listener.js
lib/messages-archive.js
... | ... | @@ -20,7 +20,7 @@ if (!redisClient) { |
20 | 20 | } |
21 | 21 | |
22 | 22 | function composeRedisCounterKeyword(origin, direction) { |
23 | - const directionLabel = direction == DIRECTION_OUTGOING ? 'OUT' : 'IN'; | |
23 | + const directionLabel = Number(direction) === DIRECTION_OUTGOING ? 'OUT' : 'IN'; | |
24 | 24 | return `CALMA_MESSAGE_COUNTER_${origin}_${directionLabel}`; |
25 | 25 | } |
26 | 26 | |
... | ... | @@ -34,7 +34,7 @@ function incrementCounter(origin, direction) { |
34 | 34 | |
35 | 35 | /** |
36 | 36 | * Menyimpan pesan ke dalam archive histori pesan di database |
37 | - * | |
37 | + * | |
38 | 38 | * @param {object} params - objek pesan yang akan disimpan |
39 | 39 | * @param {string} [params.origin_label] - label origin |
40 | 40 | * @param {string} [params.origin=UNKNOWN] - digunakan sebagai label origin jika tdk ditentukan |
... | ... | @@ -44,18 +44,18 @@ function incrementCounter(origin, direction) { |
44 | 44 | * @param {string} [params.message] - isi pesan, jika params.msg tidak terdefinisi |
45 | 45 | * @param {number} direction - 0: incoming, 1: outgoing |
46 | 46 | */ |
47 | -function insert(params, direction) { | |
47 | +function insert(xid, params, direction) { | |
48 | 48 | incrementCounter( |
49 | 49 | params.origin_label || params.origin, |
50 | - direction | |
50 | + direction, | |
51 | 51 | ); |
52 | 52 | |
53 | 53 | if (!db.pool) { |
54 | - logger.warn('MESSAGE-ARCHIVE: DB POOL is not ready to insert message history'); | |
54 | + logger.warn('MESSAGE-ARCHIVE: DB POOL is not ready to insert message history', { xid }); | |
55 | 55 | return; |
56 | 56 | } |
57 | 57 | |
58 | - const query = `INSERT INTO messages SET ?`; | |
58 | + const query = 'INSERT INTO messages SET ?'; | |
59 | 59 | const values = [{ |
60 | 60 | origin_label: (params.origin_label || params.origin || 'UNKNOWN').trim(), |
61 | 61 | origin_transport: (params.origin_transport || 'UNKNOWN').trim(), |
... | ... | @@ -67,11 +67,11 @@ function insert(params, direction) { |
67 | 67 | db.pool.query(query, values, async (err) => { |
68 | 68 | if (err) { |
69 | 69 | const fullQuery = await db.format(query, values); |
70 | - logger.warn(`MESSAGES-ARCHIVE: DB ERROR on inserting message. ${err.toString()}`, { query: fullQuery }); | |
70 | + logger.warn(`MESSAGES-ARCHIVE: DB ERROR on inserting message. ${err.toString()}`, { xid, query: fullQuery }); | |
71 | 71 | } |
72 | 72 | }); |
73 | 73 | } |
74 | 74 | |
75 | 75 | exports.insert = insert; |
76 | 76 | exports.DIRECTION_INCOMING = DIRECTION_INCOMING; |
77 | -exports.DIRECTION_OUTGOING = DIRECTION_OUTGOING; | |
78 | 77 | \ No newline at end of file |
78 | +exports.DIRECTION_OUTGOING = DIRECTION_OUTGOING; |