From 0fd7b980de3de11d55e586993123acec1986e7c0 Mon Sep 17 00:00:00 2001 From: ibuler Date: Sat, 5 Dec 2015 17:55:45 +0800 Subject: [PATCH] fix some bug --- connect.py | 4 ++-- jumpserver/api.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/connect.py b/connect.py index 4ab1f4934..54a4b03b4 100644 --- a/connect.py +++ b/connect.py @@ -458,8 +458,8 @@ class Nav(object): 5) 输入 \033[32mG/g\033[0m\033[0m + \033[32m组ID\033[0m 显示该组下主机. 6) 输入 \033[32mE/e\033[0m 批量执行命令. 7) 输入 \033[32mU/u\033[0m 批量上传文件. - 7) 输入 \033[32mD/d\033[0m 批量下载文件. - 7) 输入 \033[32mQ/q\033[0m 退出. + 8) 输入 \033[32mD/d\033[0m 批量下载文件. + 9) 输入 \033[32mQ/q\033[0m 退出. """ print textwrap.dedent(msg) diff --git a/jumpserver/api.py b/jumpserver/api.py index 3d7cd7f0e..f7ab1b7fa 100644 --- a/jumpserver/api.py +++ b/jumpserver/api.py @@ -96,7 +96,7 @@ def get_role_key(user, role): with open(os.path.join(role.key_path, 'id_rsa')) as fk: with open(user_role_key_path, 'w') as fu: fu.write(fk.read()) - logger.debug(u"创建新的用户角色key %s" % user_role_key_path) + logger.debug(u"创建新的用户角色key %s, Owner: %s" % (user_role_key_path, user.username)) chown(user_role_key_path, user.username) os.chmod(user_role_key_path, 0600) return user_role_key_path