From 1b372902e77e103925247d0ee49a5f5e14734a23 Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Thu, 25 Apr 2019 22:46:01 +0300 Subject: [PATCH] windows: Fix w and logs --- pupy/modules/w.py | 4 +++- pupy/packages/windows/all/readlogs.py | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pupy/modules/w.py b/pupy/modules/w.py index 5a0e4861..526d1382 100644 --- a/pupy/modules/w.py +++ b/pupy/modules/w.py @@ -99,6 +99,8 @@ class WModule(PupyModule): if idle is not None and idle < 10 * 60: color = 'cyan' + elif disconnect_time is None: + color = 'green' elif disconnect_time > current_time: color = 'lightgrey' @@ -149,7 +151,7 @@ class WModule(PupyModule): self.log(Table(records, cols)) return - except Exception: + except Exception as e: pass try: diff --git a/pupy/packages/windows/all/readlogs.py b/pupy/packages/windows/all/readlogs.py index 31dff25f..6fda2d04 100644 --- a/pupy/packages/windows/all/readlogs.py +++ b/pupy/packages/windows/all/readlogs.py @@ -10,7 +10,7 @@ from winerror import HRESULT_CODE from time import time -from pupwinutils.security import LookupAccountSidW as LookupAccountSid +from pupwinutils.security import namebysid try: from pupwinutils.security import StationNameByPid except ImportError: @@ -286,7 +286,7 @@ class EventLog(object): if ev_obj.Sid is not None: try: - domain, domain_user, _ = LookupAccountSid(server, ev_obj.Sid) + domain, domain_user = namebysid(str(ev_obj.Sid)) user = u'{}\\{}'.format(domain, domain_user) except error: user = str(ev_obj.Sid)