|
17 | 17 | import queues
|
18 | 18 | import state
|
19 | 19 | from addresses import encodeAddress
|
20 |
| - from bmconfigparser import BMConfigParser |
| 20 | + from bmconfigparser import config, config_ready |
21 | 21 | from tr import _translate
|
22 | 22 | except ImportError:
|
23 | 23 | from . import helper_sql, helper_startup, paths, queues, state
|
24 | 24 | from .addresses import encodeAddress
|
25 |
| - from .bmconfigparser import BMConfigParser |
| 25 | + from .bmconfigparser import config, config_ready |
26 | 26 | from .tr import _translate
|
27 | 27 |
|
28 | 28 | logger = logging.getLogger('default')
|
@@ -260,16 +260,16 @@ def __init__(self):
|
260 | 260 | def sql_config_settings_version(self):
|
261 | 261 | """ Getter for BMConfigParser (obj) """
|
262 | 262 |
|
263 |
| - return BMConfigParser().getint( |
| 263 | + return config.getint( |
264 | 264 | 'bitmessagesettings', 'settingsversion')
|
265 | 265 |
|
266 | 266 | @sql_config_settings_version.setter
|
267 | 267 | def sql_config_settings_version(self, settingsversion): # pylint: disable=R0201, no-self-use
|
268 | 268 | # Setter for BmConfigparser
|
269 | 269 |
|
270 |
| - BMConfigParser().set( |
| 270 | + config.set( |
271 | 271 | 'bitmessagesettings', 'settingsversion', str(int(settingsversion) + 1))
|
272 |
| - return BMConfigParser().save() |
| 272 | + return config.save() |
273 | 273 |
|
274 | 274 | def upgrade_config_setting_version(self):
|
275 | 275 | """
|
@@ -431,6 +431,8 @@ def run(self): # pylint: disable=too-many-locals, too-many-branches, too-many-s
|
431 | 431 |
|
432 | 432 | helper_sql.sql_available = True
|
433 | 433 |
|
| 434 | + config_ready.wait() |
| 435 | + |
434 | 436 | self.db.create_sql_function()
|
435 | 437 |
|
436 | 438 | self.db.initialize_schema()
|
|
0 commit comments