From 8a8f68d908823d1226c582158704578bacfb04d8 Mon Sep 17 00:00:00 2001 From: halcyon <864072399@qq.com> Date: Wed, 22 Apr 2015 18:04:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8username=20=20=E5=8E=BB?= =?UTF-8?q?=E6=8E=89log=5Fha=E9=87=8C=E7=9A=84print?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jperm/views.py | 4 ++-- log_handler.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jperm/views.py b/jperm/views.py index ed633a76..57559444 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -634,7 +634,7 @@ def perm_apply(request): """ æƒé™ç”³è¯· """ header_title, path1, path2 = u'主机æƒé™ç”³è¯·', u'æƒé™ç®¡ç†', u'申请主机' user_id, username = get_session_user_info(request)[0:2] - name = User.objects.get(id=user_id).name + name = User.objects.get(id=user_id).username dept_id, deptname, dept = get_session_user_info(request)[3:6] perm_host = user_perm_asset_api(username) all_host = Asset.objects.filter(dept=dept) @@ -700,7 +700,7 @@ def perm_apply_exec(request): smg = 'æ¤æƒé™å·²ç»å®¡æ‰¹å®Œæˆ, 请勿é‡å¤å®¡æ‰¹, åç§’é’ŸåŽè¿”回首页' return render_to_response('jperm/perm_apply_exec.html', locals(), context_instance=RequestContext(request)) else: - user = User.objects.get(name=q_apply.applyer) + user = User.objects.get(username=q_apply.applyer) mail_address = user.email time_now = datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S') p_apply.update(status=1, approver=approver, date_end=time_now) diff --git a/log_handler.py b/log_handler.py index 0d8b91e7..601237b0 100755 --- a/log_handler.py +++ b/log_handler.py @@ -66,7 +66,6 @@ def run(): log_hanler(pid_id) for pid_id, pid, log_path, is_finished, log_finished, start_time in pids1: - print pid_id, start_time, type(start_time) try: file_time = int(os.stat(log_path).st_ctime) now_time = int(time.time()) -- 2.18.0