Skip to content

Commit 72195b1

Browse files
made all mongoLogger accesses in topology.ts be conditional
1 parent 7c79e9d commit 72195b1

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

src/sdam/topology.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -569,9 +569,9 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
569569

570570
options = { serverSelectionTimeoutMS: this.s.serverSelectionTimeoutMS, ...options };
571571
if (
572-
this.client.mongoLogger.willLog(SeverityLevel.DEBUG, MongoLoggableComponent.SERVER_SELECTION)
572+
this.client.mongoLogger?.willLog(SeverityLevel.DEBUG, MongoLoggableComponent.SERVER_SELECTION)
573573
) {
574-
this.client.mongoLogger.debug(
574+
this.client.mongoLogger?.debug(
575575
MongoLoggableComponent.SERVER_SELECTION,
576576
new ServerSelectionStartedEvent(selector, this.description, options.operationName)
577577
);
@@ -583,12 +583,12 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
583583

584584
if (isSharded && transaction && transaction.server) {
585585
if (
586-
this.client.mongoLogger.willLog(
586+
this.client.mongoLogger?.willLog(
587587
SeverityLevel.DEBUG,
588588
MongoLoggableComponent.SERVER_SELECTION
589589
)
590590
) {
591-
this.client.mongoLogger.debug(
591+
this.client.mongoLogger?.debug(
592592
MongoLoggableComponent.SERVER_SELECTION,
593593
new ServerSelectionSucceededEvent(
594594
selector,
@@ -623,12 +623,12 @@ export class Topology extends TypedEventEmitter<TopologyEvents> {
623623
this.description
624624
);
625625
if (
626-
this.client.mongoLogger.willLog(
626+
this.client.mongoLogger?.willLog(
627627
SeverityLevel.DEBUG,
628628
MongoLoggableComponent.SERVER_SELECTION
629629
)
630630
) {
631-
this.client.mongoLogger.debug(
631+
this.client.mongoLogger?.debug(
632632
MongoLoggableComponent.SERVER_SELECTION,
633633
new ServerSelectionFailedEvent(
634634
selector,
@@ -915,12 +915,12 @@ function drainWaitQueue(queue: List<ServerSelectionRequest>, err?: MongoDriverEr
915915
if (!waitQueueMember[kCancelled]) {
916916
if (err) {
917917
if (
918-
waitQueueMember.mongoLogger.willLog(
918+
waitQueueMember.mongoLogger?.willLog(
919919
SeverityLevel.DEBUG,
920920
MongoLoggableComponent.SERVER_SELECTION
921921
)
922922
) {
923-
waitQueueMember.mongoLogger.debug(
923+
waitQueueMember.mongoLogger?.debug(
924924
MongoLoggableComponent.SERVER_SELECTION,
925925
new ServerSelectionFailedEvent(
926926
waitQueueMember.serverSelector,
@@ -969,12 +969,12 @@ function processWaitQueue(topology: Topology) {
969969
} catch (e) {
970970
waitQueueMember.timeoutController.clear();
971971
if (
972-
topology.client.mongoLogger.willLog(
972+
topology.client.mongoLogger?.willLog(
973973
SeverityLevel.DEBUG,
974974
MongoLoggableComponent.SERVER_SELECTION
975975
)
976976
) {
977-
topology.client.mongoLogger.debug(
977+
topology.client.mongoLogger?.debug(
978978
MongoLoggableComponent.SERVER_SELECTION,
979979
new ServerSelectionFailedEvent(
980980
waitQueueMember.serverSelector,
@@ -992,12 +992,12 @@ function processWaitQueue(topology: Topology) {
992992
if (selectedDescriptions.length === 0) {
993993
if (!waitQueueMember.waitingLogged) {
994994
if (
995-
topology.client.mongoLogger.willLog(
995+
topology.client.mongoLogger?.willLog(
996996
SeverityLevel.INFORMATIONAL,
997997
MongoLoggableComponent.SERVER_SELECTION
998998
)
999999
) {
1000-
topology.client.mongoLogger.info(
1000+
topology.client.mongoLogger?.info(
10011001
MongoLoggableComponent.SERVER_SELECTION,
10021002
new WaitingForSuitableServerEvent(
10031003
waitQueueMember.serverSelector,
@@ -1032,12 +1032,12 @@ function processWaitQueue(topology: Topology) {
10321032
topology.description
10331033
);
10341034
if (
1035-
topology.client.mongoLogger.willLog(
1035+
topology.client.mongoLogger?.willLog(
10361036
SeverityLevel.DEBUG,
10371037
MongoLoggableComponent.SERVER_SELECTION
10381038
)
10391039
) {
1040-
topology.client.mongoLogger.debug(
1040+
topology.client.mongoLogger?.debug(
10411041
MongoLoggableComponent.SERVER_SELECTION,
10421042
new ServerSelectionFailedEvent(
10431043
waitQueueMember.serverSelector,
@@ -1058,12 +1058,12 @@ function processWaitQueue(topology: Topology) {
10581058
waitQueueMember.timeoutController.clear();
10591059

10601060
if (
1061-
topology.client.mongoLogger.willLog(
1061+
topology.client.mongoLogger?.willLog(
10621062
SeverityLevel.DEBUG,
10631063
MongoLoggableComponent.SERVER_SELECTION
10641064
)
10651065
) {
1066-
topology.client.mongoLogger.debug(
1066+
topology.client.mongoLogger?.debug(
10671067
MongoLoggableComponent.SERVER_SELECTION,
10681068
new ServerSelectionSucceededEvent(
10691069
waitQueueMember.serverSelector,

0 commit comments

Comments
 (0)