projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 868 - Fixed
[osm/NBI.git]
/
osm_nbi
/
engine.py
diff --git
a/osm_nbi/engine.py
b/osm_nbi/engine.py
index
0211bd6
..
f9fb1e7
100644
(file)
--- a/
osm_nbi/engine.py
+++ b/
osm_nbi/engine.py
@@
-15,7
+15,7
@@
import logging
import yaml
import logging
import yaml
-from osm_common import dbmongo, dbmemory, fslocal, msglocal, msgkafka, version as common_version
+from osm_common import dbmongo, dbmemory, fslocal,
fsmongo,
msglocal, msgkafka, version as common_version
from osm_common.dbbase import DbException
from osm_common.fsbase import FsException
from osm_common.msgbase import MsgException
from osm_common.dbbase import DbException
from osm_common.fsbase import FsException
from osm_common.msgbase import MsgException
@@
-106,6
+106,9
@@
class Engine(object):
if config["storage"]["driver"] == "local":
self.fs = fslocal.FsLocal()
self.fs.fs_connect(config["storage"])
if config["storage"]["driver"] == "local":
self.fs = fslocal.FsLocal()
self.fs.fs_connect(config["storage"])
+ elif config["storage"]["driver"] == "mongo":
+ self.fs = fsmongo.FsMongo()
+ self.fs.fs_connect(config["storage"])
else:
raise EngineException("Invalid configuration param '{}' at '[storage]':'driver'".format(
config["storage"]["driver"]))
else:
raise EngineException("Invalid configuration param '{}' at '[storage]':'driver'".format(
config["storage"]["driver"]))
@@
-159,7
+162,8
@@
class Engine(object):
else:
self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.auth)
else:
self.map_topic[topic] = topic_class(self.db, self.fs, self.msg, self.auth)
- self.map_topic["pm_jobs"] = PmJobsTopic(config["prometheus"].get("host"), config["prometheus"].get("port"))
+ self.map_topic["pm_jobs"] = PmJobsTopic(self.db, config["prometheus"].get("host"),
+ config["prometheus"].get("port"))
except (DbException, FsException, MsgException) as e:
raise EngineException(str(e), http_code=e.http_code)
except (DbException, FsException, MsgException) as e:
raise EngineException(str(e), http_code=e.http_code)