summaryrefslogtreecommitdiff
path: root/src/server/rz_server.py
diff options
context:
space:
mode:
authorLV-426 <lv-426@taproot.org.il>2015-05-05 01:33:35 +0300
committerLV-426 <lv-426@taproot.org.il>2015-05-05 19:28:09 +0300
commit0e1d15d0d464b6b6dbaeb2744bfa2008f83d91a8 (patch)
treeaa188dba82b9e989ff640205e129bb61ffd1486a /src/server/rz_server.py
parent17290bc6d011ec3bd3dfb4cdbefa3bb7843ee660 (diff)
init_DB(): more refactoring, assist kernel via op_factory__DBO_rzdb__init_DB
Diffstat (limited to 'src/server/rz_server.py')
-rw-r--r--src/server/rz_server.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 7442a16b..21f29160 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -261,6 +261,9 @@ class FlaskExt(Flask):
request.peer_sock_addr = self.req_probe__sock_addr.probe_client_socket_addr__http_req(request)
request.host_sock_addr = self.req_probe__sock_addr.probe_requested_host__http_req(request)
+ def gen_op__rzdb__init_DB(self): # provided to assist kernel with DB initialization
+ return DBO_rzdb__init_DB(self.rz_config.rzdoc__mainpage_name)
+
def make_default_options_response(self):
ret = Flask.make_default_options_response(self)
@@ -508,14 +511,15 @@ if __name__ == "__main__":
# init kernel
#
kernel = RZ_Kernel()
+ kernel.db_ctl = DB_Controller(cfg.db_base_url)
#
# init webapp
#
webapp = init_webapp(cfg, kernel)
- ws_srv = init_ws_interface(cfg, kernel, webapp)
-
webapp.user_db = user_db
+ kernel.op_factory__DBO_rzdb__init_DB = webapp # assist kernel with DB initialization
+ ws_srv = init_ws_interface(cfg, kernel, webapp)
try:
kernel.start()