diff --git a/py/api/api_logs.py b/py/api/api_logs.py index 7267084..21289f7 100644 --- a/py/api/api_logs.py +++ b/py/api/api_logs.py @@ -247,7 +247,8 @@ def syslog_list(): else: clauses.append(syslog.created >= datetime.datetime.now()-datetime.timedelta(days=1)) if event_end_time: - event_end_time=datetime.datetime.strptime(event_end_time, "%Y-%m-%d %H:%M:%S") + event_end_time=event_end_time.split(".000Z")[0] + event_end_time=datetime.datetime.strptime(event_end_time, "%Y-%m-%dT%H:%M:%S") clauses.append(syslog.created <= event_end_time) else: clauses.append(syslog.created <= datetime.datetime.now()) diff --git a/py/libs/db/db_AA.py b/py/libs/db/db_AA.py index 1ed59c0..53a57f9 100644 --- a/py/libs/db/db_AA.py +++ b/py/libs/db/db_AA.py @@ -78,12 +78,8 @@ class Auth(BaseModel): auth=auth.where(Auth.started > timestamp-2,Auth.started < timestamp+2) time.sleep(0.3) count+=1 - log.error(count) else: auth=False - log.error(auth) - if auth: - log.error(list(auth)) if auth and len(list(auth))>0: auth=list(auth) for a in auth: diff --git a/py/libs/db/db_user_group_perm.py b/py/libs/db/db_user_group_perm.py index 9302a01..95d6c35 100644 --- a/py/libs/db/db_user_group_perm.py +++ b/py/libs/db/db_user_group_perm.py @@ -31,7 +31,7 @@ class DevUserGroupPermRel(BaseModel): def __repr__(self): return "DevUserGroupPermRel: user_id: %s, group_id: %s, perm_id: %s" % (self.user_id, self.group_id, self.perm_id) - def get_user_devices(uid,group_id): + def get_user_devices(uid,group_id=False): perms=list(DevUserGroupPermRel.select().where(DevUserGroupPermRel.user_id == uid)) for perm in perms: if group_id==1 or (perm.group_id.id == 1 and not group_id):