From aff629ba3347f6279ec6cd51996d7b63115e355b Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 8 Oct 2015 18:11:30 +0000
Subject: [PATCH] return timestamps for stat
---
src/python/dm/common/service/loginController.py | 1 +
src/python/dm/common/utility/fileUtility.py | 10 +++++++---
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/python/dm/common/service/loginController.py b/src/python/dm/common/service/loginController.py
index 3f2707c5..fd87167d 100755
--- a/src/python/dm/common/service/loginController.py
+++ b/src/python/dm/common/service/loginController.py
@@ -159,6 +159,7 @@ class LoginController(DmController):
sessionTuple = sessionCache.get(sessionId)
if sessionTuple:
sessionInfo = sessionTuple[0]
+ logger.debug('Retrieved session info from cache: %s' % sessionInfo)
else:
logger.debug('Retrieved session %s from SSO Manager' % sessionId)
sessionCache[sessionId] = (sessionInfo, datetime.datetime.now())
diff --git a/src/python/dm/common/utility/fileUtility.py b/src/python/dm/common/utility/fileUtility.py
index 19b80d39..6aa499ce 100755
--- a/src/python/dm/common/utility/fileUtility.py
+++ b/src/python/dm/common/utility/fileUtility.py
@@ -3,6 +3,7 @@
import os
import stat
from dm.common.utility.dmSubprocess import DmSubprocess
+from dm.common.utility.timeUtility import TimeUtility
class FileUtility:
@@ -20,9 +21,12 @@ class FileUtility:
statResult = os.stat(filePath)
fileInfo['filePath'] = filePath
fileInfo['fileSize'] = statResult[stat.ST_SIZE]
- fileInfo['createTime'] = statResult[stat.ST_CTIME]
- fileInfo['accessTime'] = statResult[stat.ST_ATIME]
- fileInfo['modifyTime'] = statResult[stat.ST_MTIME]
+ fileInfo['fileCreationTime'] = statResult[stat.ST_CTIME]
+ fileInfo['fileCreationTimeStamp'] = TimeUtility.formatLocalTimeStamp(statResult[stat.ST_CTIME])
+ fileInfo['fileAccessTime'] = statResult[stat.ST_ATIME]
+ fileInfo['fileAccessTimeStamp'] = TimeUtility.formatLocalTimeStamp(statResult[stat.ST_ATIME])
+ fileInfo['fileModificationTime'] = statResult[stat.ST_MTIME]
+ fileInfo['fileModificationTimeStamp'] = TimeUtility.formatLocalTimeStamp(statResult[stat.ST_MTIME])
return fileInfo
#######################################################################
--
GitLab