Show More
@@ -54,18 +54,27 b' from IPython.kernel.zmq.session import (' | |||||
54 | from IPython.parallel.controller.heartmonitor import HeartMonitor |
|
54 | from IPython.parallel.controller.heartmonitor import HeartMonitor | |
55 | from IPython.parallel.controller.hub import HubFactory |
|
55 | from IPython.parallel.controller.hub import HubFactory | |
56 | from IPython.parallel.controller.scheduler import TaskScheduler,launch_scheduler |
|
56 | from IPython.parallel.controller.scheduler import TaskScheduler,launch_scheduler | |
57 |
from IPython.parallel.controller. |
|
57 | from IPython.parallel.controller.dictdb import DictDB | |
58 |
|
58 | |||
59 | from IPython.parallel.util import split_url, disambiguate_url |
|
59 | from IPython.parallel.util import split_url, disambiguate_url | |
60 |
|
60 | |||
61 | # conditional import of MongoDB backend class |
|
61 | # conditional import of SQLiteDB / MongoDB backend class | |
|
62 | real_dbs = [] | |||
|
63 | ||||
|
64 | try: | |||
|
65 | from IPython.parallel.controller.sqlitedb import SQLiteDB | |||
|
66 | except ImportError: | |||
|
67 | pass | |||
|
68 | else: | |||
|
69 | real_dbs.append(SQLiteDB) | |||
62 |
|
70 | |||
63 | try: |
|
71 | try: | |
64 | from IPython.parallel.controller.mongodb import MongoDB |
|
72 | from IPython.parallel.controller.mongodb import MongoDB | |
65 | except ImportError: |
|
73 | except ImportError: | |
66 | maybe_mongo = [] |
|
74 | pass | |
67 | else: |
|
75 | else: | |
68 | maybe_mongo = [MongoDB] |
|
76 | real_dbs.append(MongoDB) | |
|
77 | ||||
69 |
|
78 | |||
70 |
|
79 | |||
71 | #----------------------------------------------------------------------------- |
|
80 | #----------------------------------------------------------------------------- | |
@@ -148,7 +157,7 b' class IPControllerApp(BaseParallelApplication):' | |||||
148 | description = _description |
|
157 | description = _description | |
149 | examples = _examples |
|
158 | examples = _examples | |
150 | config_file_name = Unicode(default_config_file_name) |
|
159 | config_file_name = Unicode(default_config_file_name) | |
151 |
classes = [ProfileDir, Session, HubFactory, TaskScheduler, HeartMonitor, |
|
160 | classes = [ProfileDir, Session, HubFactory, TaskScheduler, HeartMonitor, DictDB] + real_dbs | |
152 |
|
161 | |||
153 | # change default to True |
|
162 | # change default to True | |
154 | auto_create = Bool(True, config=True, |
|
163 | auto_create = Bool(True, config=True, |
General Comments 0
You need to be logged in to leave comments.
Login now