Skip to content

Commit 27e9dc0

Browse files
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver
2 parents dcc2bff + cdf04ff commit 27e9dc0

File tree

7 files changed

+68
-6
lines changed

7 files changed

+68
-6
lines changed

.github/workflows/codeql.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ "master", "v*"]
6+
tags: ['*']
7+
pull_request:
8+
schedule:
9+
- cron: '17 10 * * 2'
10+
11+
concurrency:
12+
group: codeql-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
analyze:
17+
name: Analyze (${{ matrix.language }})
18+
runs-on: "ubuntu-latest"
19+
timeout-minutes: 360
20+
permissions:
21+
# required for all workflows
22+
security-events: write
23+
24+
# required to fetch internal or private CodeQL packs
25+
packages: read
26+
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
include:
31+
- language: c-cpp
32+
build-mode: manual
33+
- language: python
34+
build-mode: none
35+
steps:
36+
- name: Checkout repository
37+
uses: actions/checkout@v4
38+
- uses: actions/setup-python@v3
39+
40+
# Initializes the CodeQL tools for scanning.
41+
- name: Initialize CodeQL
42+
uses: github/codeql-action/init@v3
43+
with:
44+
languages: ${{ matrix.language }}
45+
build-mode: ${{ matrix.build-mode }}
46+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
47+
queries: security-extended
48+
config: |
49+
paths-ignore:
50+
- '.github/**'
51+
- 'doc/**'
52+
- 'tools/**'
53+
- 'test/**'
54+
55+
- if: matrix.build-mode == 'manual'
56+
run: |
57+
pip install -e .
58+
59+
- name: Perform CodeQL Analysis
60+
uses: github/codeql-action/analyze@v3
61+
with:
62+
category: "/language:${{matrix.language}}"

doc/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Version 4.7.3 has further fixes for lazily loading modules.
1717

1818
- Use deferred imports instead of importlib lazy module loading.
1919
- Improve import time on Windows.
20+
- Reduce verbosity of "Waiting for suitable server to become available" log message from info to debug.
2021

2122
Issues Resolved
2223
...............

pymongo/topology.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
from pymongo.logger import (
4545
_SERVER_SELECTION_LOGGER,
4646
_debug_log,
47-
_info_log,
4847
_ServerSelectionStatusMessage,
4948
)
5049
from pymongo.monitor import SrvMonitor
@@ -306,7 +305,7 @@ def _select_servers_loop(
306305
)
307306

308307
if not logged_waiting:
309-
_info_log(
308+
_debug_log(
310309
_SERVER_SELECTION_LOGGER,
311310
message=_ServerSelectionStatusMessage.WAITING,
312311
selector=selector,

test/server_selection_logging/operation-id.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
}
195195
},
196196
{
197-
"level": "info",
197+
"level": "debug",
198198
"component": "serverSelection",
199199
"data": {
200200
"message": "Waiting for suitable server to become available",

test/server_selection_logging/replica-set.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
}
185185
},
186186
{
187-
"level": "info",
187+
"level": "debug",
188188
"component": "serverSelection",
189189
"data": {
190190
"message": "Waiting for suitable server to become available",

test/server_selection_logging/sharded.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
}
194194
},
195195
{
196-
"level": "info",
196+
"level": "debug",
197197
"component": "serverSelection",
198198
"data": {
199199
"message": "Waiting for suitable server to become available",

test/server_selection_logging/standalone.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
}
212212
},
213213
{
214-
"level": "info",
214+
"level": "debug",
215215
"component": "serverSelection",
216216
"data": {
217217
"message": "Waiting for suitable server to become available",

0 commit comments

Comments
 (0)