summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Levy <alon@pobox.com>2015-02-17 12:57:43 +0200
committerAlon Levy <alon@pobox.com>2015-02-17 12:57:43 +0200
commit8809edb9687c635e896238ad4beba3a432bb2a6d (patch)
tree986cc5f6866cf56a92ba994b4d1179ba5f918841
parentedf91a5ab2a6afa88999403af5b11b722bb0b378 (diff)
server: take config and log initialization out of initial try/catch since catch assumes log is intact anyway
-rw-r--r--src/server/rz_server.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 6868317f..06bf4701 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -315,10 +315,9 @@ if __name__ == "__main__":
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)
- 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: