summaryrefslogtreecommitdiff
path: root/src/server/rz_server.py
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-02-17 15:44:06 +0200
committerAlon Levy <alon@pobox.com>2015-02-17 15:44:06 +0200
commit8193b56e2eb6c5f5ae904d103046470e51e97725 (patch)
treec030c0106345040e4d6cbb000c0136f6f21e7a99 /src/server/rz_server.py
parenta84585c4a9955e21b428f83719348243e4e2a129 (diff)
server/rz_server: alternative to taking cfg&log initialization out of the try/catch
Diffstat (limited to 'src/server/rz_server.py')
-rw-r--r--src/server/rz_server.py17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 06bf4701..20ab3d1b 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -309,15 +309,28 @@ def shutdown():
user_db.shutdown()
log.info('rz_server: shutting down')
+class MinimalLog(object):
+ """
+ Minimal logger implementation to serve until init_log completes, which
+ means init_config succeeded as well.
+ """
+ def exception(self, e):
+ print(e)
+ def info(self, msg):
+ print(msg)
+
+log = MinimalLog()
+
if __name__ == "__main__":
p = argparse.ArgumentParser(description='rhizi-server')
p.add_argument('--config-dir', help='path to Rhizi config dir', default='res/etc')
args = p.parse_args()
- cfg = init_config(args.config_dir)
- log = init_log(cfg)
try:
+ cfg = init_config(args.config_dir)
+ raise Exception("my test")
+ log = init_log(cfg)
cfg_indent_str = ' ' + str(cfg).replace('\n', '\n ')
log.info('loaded configuration:\n%s' % cfg_indent_str) # print indented
if False == cfg.access_control: