23
23
#define LOGARGS (pipeline , lvl ) \
24
24
((lcb_INSTANCE *)((pipeline)->parent->cqdata))->settings, "mcreq", LCB_LOG_##lvl, __FILE__, __LINE__
25
25
26
+ #define LOGFMT "(SRV=%p,IX=%d) "
27
+ #define LOGID (pipeline ) (void *)(pipeline), (pipeline)->index
28
+
26
29
#define PKT_HDRSIZE (pkt ) (MCREQ_PKT_BASESIZE + (pkt)->extlen)
27
30
28
31
lcb_STATUS mcreq_reserve_header (mc_PIPELINE * pipeline , mc_PACKET * packet , uint8_t hdrsize )
@@ -309,7 +312,9 @@ static mc_PACKET *check_collection_id(mc_PIPELINE *pipeline, mc_PACKET *packet)
309
312
}
310
313
} else if (pipeline -> parent -> cqdata ) {
311
314
lcb_log (LOGARGS (pipeline , DEBUG ),
312
- "Custom collection id has been dispatched to the node, that does not support collections" );
315
+ LOGFMT
316
+ "Custom collection id has been dispatched to the node, that does not support collections" ,
317
+ LOGID (pipeline ));
313
318
}
314
319
}
315
320
break ;
@@ -318,7 +323,8 @@ static mc_PACKET *check_collection_id(mc_PIPELINE *pipeline, mc_PACKET *packet)
318
323
// the pipeline hadn't completed handshake yet, so trust global settings, and let operation be fixed
319
324
// when it will be retried in case of misprediction.
320
325
if (pipeline -> parent -> cqdata ) {
321
- lcb_log (LOGARGS (pipeline , DEBUG ), "Collections has not been negotiated for the pipeline yet" );
326
+ lcb_log (LOGARGS (pipeline , DEBUG ), LOGFMT "Collections has not been negotiated for the pipeline yet" ,
327
+ LOGID (pipeline ));
322
328
}
323
329
break ;
324
330
}
0 commit comments