Skip to content

Commit 77ffa95

Browse files
committed
Make ReadPreference.PRIMARY default unless the value of
'read_preference' is supplied through settings.
1 parent d3f3d39 commit 77ffa95

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

flask_mongoengine/connection.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import atexit, os.path, time, mongoengine, sys
2-
import shutil, subprocess, tempfile, pymongo
2+
import shutil, subprocess, tempfile
33
from flask import current_app
44
from pymongo import MongoClient, ReadPreference, errors, uri_parser
55
from subprocess import Popen, PIPE
@@ -13,10 +13,6 @@
1313
)
1414

1515
DEFAULT_CONNECTION_NAME = 'default-mongodb-connection'
16-
IS_PYMONGO_3 = (pymongo.version_tuple[0] < 3)
17-
if IS_PYMONGO_3:
18-
READ_PREFERENCE = ReadPreference.PRIMARY
19-
else: READ_PREFERENCE = False
2016

2117
_connection_settings = {}
2218
_connections = {}
@@ -250,13 +246,12 @@ def _resolve_settings(conn_setting, removePass=True):
250246
port = conn_setting.get('MONGODB_PORT', conn_setting.get('port', 27017))
251247
username = conn_setting.get('MONGODB_USERNAME', conn_setting.get('username', None))
252248
password = conn_setting.get('MONGODB_PASSWORD', conn_setting.get('password', None))
253-
249+
# Default to ReadPreference.PRIMARY if no read_preference is supplied
254250
read_preference = conn_setting.get('MONGODB_READ_PREFERENCE',
255-
conn_setting.get('read_preference', READ_PREFERENCE))
251+
conn_setting.get('read_preference', ReadPreference.PRIMARY))
256252

257253
resolved = {}
258-
if read_preference:
259-
resolved['read_preference'] = read_preference
254+
resolved['read_preference'] = read_preference
260255
resolved['alias'] = alias
261256
resolved['name'] = db
262257
resolved['host'] = host

0 commit comments

Comments
 (0)