|
1 | 1 | import atexit, os.path, time, mongoengine, sys |
2 | | -import shutil, subprocess, tempfile, pymongo |
| 2 | +import shutil, subprocess, tempfile |
3 | 3 | from flask import current_app |
4 | 4 | from pymongo import MongoClient, ReadPreference, errors, uri_parser |
5 | 5 | from subprocess import Popen, PIPE |
|
13 | 13 | ) |
14 | 14 |
|
15 | 15 | 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 |
20 | 16 |
|
21 | 17 | _connection_settings = {} |
22 | 18 | _connections = {} |
@@ -250,13 +246,12 @@ def _resolve_settings(conn_setting, removePass=True): |
250 | 246 | port = conn_setting.get('MONGODB_PORT', conn_setting.get('port', 27017)) |
251 | 247 | username = conn_setting.get('MONGODB_USERNAME', conn_setting.get('username', None)) |
252 | 248 | password = conn_setting.get('MONGODB_PASSWORD', conn_setting.get('password', None)) |
253 | | - |
| 249 | + # Default to ReadPreference.PRIMARY if no read_preference is supplied |
254 | 250 | read_preference = conn_setting.get('MONGODB_READ_PREFERENCE', |
255 | | - conn_setting.get('read_preference', READ_PREFERENCE)) |
| 251 | + conn_setting.get('read_preference', ReadPreference.PRIMARY)) |
256 | 252 |
|
257 | 253 | resolved = {} |
258 | | - if read_preference: |
259 | | - resolved['read_preference'] = read_preference |
| 254 | + resolved['read_preference'] = read_preference |
260 | 255 | resolved['alias'] = alias |
261 | 256 | resolved['name'] = db |
262 | 257 | resolved['host'] = host |
|
0 commit comments