From e53b90f5c0deb2d665f1bb3333e53eaaedc0bc14 Mon Sep 17 00:00:00 2001 From: LV-426 Date: Thu, 2 Apr 2015 23:04:08 +0300 Subject: rz_server: remove rm, inline MinimalLog print statements --- src/server/rz_server.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/server/rz_server.py b/src/server/rz_server.py index 6ca16b13..62e3fc6e 100644 --- a/src/server/rz_server.py +++ b/src/server/rz_server.py @@ -336,20 +336,14 @@ 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__": + try: # enable pydev remote debugging + import pydevd + pydevd.settrace() + except ImportError: + pass + p = argparse.ArgumentParser(description='rhizi-server') p.add_argument('--config-dir', help='path to Rhizi config dir', default='res/etc') args = p.parse_args() @@ -357,6 +351,11 @@ if __name__ == "__main__": try: cfg = init_config(args.config_dir) log = init_log(cfg) + except Exception as e: + print('failed to initialize server: ' + e.message) + exit(-1) + + try: cfg_indent_str = ' ' + str(cfg).replace('\n', '\n ') log.info('loaded configuration:\n%s' % cfg_indent_str) # print indented if False == cfg.access_control: -- cgit v1.3.1