Skip to content
This repository was archived by the owner on Jan 17, 2025. It is now read-only.

Commit 4f3619c

Browse files
authored
fixed the retrieval of the revision in a change notification and (#69)
fixed the retrieval of the revision in a change notification and improved logging for better LogDNA filtering
1 parent 1109c00 commit 4f3619c

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

provider/lib/manager.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ module.exports = function (logger, triggerDB, redisClient) {
113113
if ( change.id != null){
114114
doc_name = change.id;
115115
}
116-
if ( change.doc != null && change.doc._rev != null ){
117-
doc_revision= change.doc._rev;
116+
if ( change.changes != null && change.changes[0] != null && change.changes[0].rev != null ){
117+
doc_revision= change.changes[0].rev;
118118
}
119119

120120
//***********************************************************
@@ -139,15 +139,15 @@ module.exports = function (logger, triggerDB, redisClient) {
139139
});
140140

141141
feed.on('timeout', function (info) {
142-
logger.info(method, 'Got timeout for', triggerData.id, 'from follow library for customer DB:', JSON.stringify(info));
142+
logger.info(method, 'Got timeout for', triggerData.id, 'from follow library for customer DB ', triggerData.dbname ,' :', JSON.stringify(info));
143143
});
144144

145145
feed.on('retry', function (info) {
146-
logger.info(method, 'Attempting retry for', triggerData.id, 'in follow library for customer DB:', JSON.stringify(info));
146+
logger.info(method, 'Attempting retry for', triggerData.id, 'in follow library for customer DB ', triggerData.dbname ,' :', JSON.stringify(info));
147147
});
148148

149149
feed.on('stop', function () {
150-
logger.info(method, "Cloudant provider stop change listening socket to customer DB for trigger:", triggerData.id );
150+
logger.info(method, "Cloudant provider stop change listening socket to customer DB ', triggerData.dbname ,' for trigger:", triggerData.id );
151151
});
152152

153153
feed.follow();
@@ -157,32 +157,32 @@ module.exports = function (logger, triggerDB, redisClient) {
157157
//* about DB change listener socket to customer DB
158158
//***********************************************************
159159
feed.on('confirm_request', function (req) {
160-
logger.info(method, 'Cloudant provider establish change listen socket to customer db for trigger: ', triggerData.id );
160+
logger.info(method, 'Cloudant provider establish change listen socket to customer db ', triggerData.dbname ,' for trigger: ', triggerData.id );
161161
});
162162

163163
feed.on('confirm', function () {
164-
logger.info(method, 'Cloudant provider starts listening for changes on customer db for trigger: ', triggerData.id );
164+
logger.info(method, 'Cloudant provider starts listening for changes on customer db ', triggerData.dbname ,' for trigger: ', triggerData.id );
165165
});
166166

167167
feed.on('timeout', function (info) {
168-
logger.info(method, 'Got timeout while listening changes on customer database for trigger:', triggerData.id, ' : ', JSON.stringify(info));
168+
logger.info(method, 'Got timeout while listening changes on customer db ', triggerData.dbname ,' for trigger:', triggerData.id, ' : ', JSON.stringify(info));
169169
});
170170

171171
feed.on('catchup', function (seq_id) {
172172
// Simple check to do only an update only with a valid seq_number
173173
if ( seq_id.includes('-') ) {
174174
triggerData.lastExecutedChangeSeqId = Number(seq_id.split('-')[0]);
175175
}
176-
logger.info(method, 'Changes sequences number on customer db ( for trigger ', triggerData.id , ' ) adjusted to : ', seq_id);
176+
logger.info(method, 'Changes sequences number on customer db ', triggerData.dbname ,' ( for trigger ', triggerData.id , ' ) adjusted to : ', seq_id);
177177
});
178178

179179
feed.on('retry', function (info) {
180-
logger.info(method, 'Follow lib retries to establish listening changes socket to customer database ( for trigger ', triggerData.id,' ) : ', JSON.stringify(info));
180+
logger.info(method, 'Follow lib retries to establish listening changes socket to customer database ', triggerData.dbname ,' ( for trigger ', triggerData.id,' ) : ', JSON.stringify(info));
181181
});
182182

183183
return new Promise(function (resolve, reject) {
184184
feed.on('error', function (err) {
185-
logger.error(method, 'Error occurred for trigger', triggerData.id, '(db ' + triggerData.dbname + '):', err);
185+
logger.error(method, 'Error occurred for trigger', triggerData.id, '(db ' + triggerData.dbname + ' ):', err);
186186
if (self.exitOnDBError === 'true' && isStartup) {
187187
process.exit(1);
188188
} else {
@@ -200,7 +200,7 @@ module.exports = function (logger, triggerDB, redisClient) {
200200
});
201201

202202
} catch (err) {
203-
logger.info(method, 'caught an exception in change listener to customer DB for trigger', triggerData.id, err);
203+
logger.info(method, 'caught an exception in change listener to customer DB ', triggerData.dbname ,' for trigger', triggerData.id, err);
204204
return Promise.reject(err);
205205
}
206206

0 commit comments

Comments
 (0)