diff options
| author | LV-426 <lv-426@taproot.org.il> | 2015-01-04 17:23:35 +0200 |
|---|---|---|
| committer | LV-426 <lv-426@taproot.org.il> | 2015-01-04 17:25:14 +0200 |
| commit | 6e02ed5c06e105d2e9eeb8d80cc5d2e0903f6c5f (patch) | |
| tree | a93240ac5f101ec22dbc537a7aec5a3c7e4a5d18 /src | |
| parent | 444bf64adb3e9b698ea92090fa7681dbd5339dca (diff) | |
rename rhizi_server -> rz_server
Diffstat (limited to 'src')
| -rw-r--r-- | src/server-tests/test_db_controller.py | 2 | ||||
| -rw-r--r-- | src/server-tests/test_rhizi_api.py | 1 | ||||
| -rw-r--r-- | src/server-tests/test_util.py | 2 | ||||
| -rw-r--r-- | src/server/rz_server.py (renamed from src/server/rhizi_server.py) | 0 | ||||
| -rwxr-xr-x | src/server/rz_server_fcgi.py (renamed from src/server/rhizi_server_fcgi.py) | 10 |
5 files changed, 8 insertions, 7 deletions
diff --git a/src/server-tests/test_db_controller.py b/src/server-tests/test_db_controller.py index 8fa2f207..b2b5689e 100644 --- a/src/server-tests/test_db_controller.py +++ b/src/server-tests/test_db_controller.py @@ -2,7 +2,7 @@ import unittest import logging import db_controller as dbc -from rhizi_server import Config +from rz_server import Config from neo4j_test_util import rand_id from neo4j_test_util import flush_db from neo4j_test_util import gen_rand_data diff --git a/src/server-tests/test_rhizi_api.py b/src/server-tests/test_rhizi_api.py index bcc60641..0de29e5b 100644 --- a/src/server-tests/test_rhizi_api.py +++ b/src/server-tests/test_rhizi_api.py @@ -4,6 +4,7 @@ import rz_api import json import logging +from rz_server import Config from rhizi_server import Config from werkzeug.test import EnvironBuilder from werkzeug.test import Client diff --git a/src/server-tests/test_util.py b/src/server-tests/test_util.py index 2c8bb294..e222584e 100644 --- a/src/server-tests/test_util.py +++ b/src/server-tests/test_util.py @@ -1,7 +1,7 @@ """ Various test utilities """ -from rhizi_server import init_webapp +from rz_server import init_webapp from rz_mesh import init_ws_interface import db_controller as dbc diff --git a/src/server/rhizi_server.py b/src/server/rz_server.py index 77a1ae7e..77a1ae7e 100644 --- a/src/server/rhizi_server.py +++ b/src/server/rz_server.py diff --git a/src/server/rhizi_server_fcgi.py b/src/server/rz_server_fcgi.py index b3985ee1..fd871abb 100755 --- a/src/server/rhizi_server_fcgi.py +++ b/src/server/rz_server_fcgi.py @@ -4,7 +4,7 @@ from flup.server.fcgi import WSGIServer import os import sys import cgitb -import rhizi_server +import rz_server from rz_kernel import RZ_Kernel @@ -14,12 +14,12 @@ from rz_kernel import RZ_Kernel cgitb.enable() if __name__ == '__main__': - cfg = rhizi_server.init_config(cfg_dir='/etc/rhizi') - log = rhizi_server.init_log(cfg) + cfg = rz_server.init_config(cfg_dir='/etc/rhizi') + log = rz_server.init_log(cfg) kernel = RZ_Kernel() - webapp = rhizi_server.init_webapp(cfg, kernel) - rhizi_server.init_rest_interface(cfg, webapp) + webapp = rz_server.init_webapp(cfg, kernel) + rz_server.init_rest_interface(cfg, webapp) log.info('launching webapp via flup.server.fcgi.WSGIServer') |