From 73356ec068db323985b20b468ba9d9c8b9e0c74e Mon Sep 17 00:00:00 2001 From: rupozzi Date: Fri, 20 May 2022 10:10:52 +0200 Subject: [PATCH 1/3] fix: Updated Webapp to the new import name for TimeUtils --- .../WebApp/handler/ComponentHistoryHandler.py | 3 +-- .../WebApp/handler/ExampleAppHandler.py | 4 ++-- .../WebApp/handler/FileCatalogHandler.py | 4 ++-- .../WebApp/handler/JobMonitorHandler.py | 4 ++-- .../WebApp/handler/PilotMonitorHandler.py | 4 ++-- .../WebApp/handler/PilotSummaryHandler.py | 4 ++-- .../WebApp/handler/ProxyManagerHandler.py | 5 +++-- .../WebApp/handler/RequestMonitorHandler.py | 4 ++-- .../WebApp/handler/ResourceSummaryHandler.py | 4 ++-- .../WebApp/handler/TokenManagerHandler.py | 4 ++-- .../handler/TransformationMonitorHandler.py | 13 ++++++----- .../WebApp/handler/VMDiracHandler.py | 22 +++++++++---------- 12 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py b/src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py index cdd786df5..8e5d866e0 100644 --- a/src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/ComponentHistoryHandler.py @@ -1,7 +1,6 @@ import json import datetime -from DIRAC.Core.Utilities import Time from DIRAC.FrameworkSystem.Client.ComponentMonitoringClient import ComponentMonitoringClient from WebAppDIRAC.Lib.WebHandler import _WebHandler as WebHandler, WErr @@ -49,7 +48,7 @@ def web_getInstallationData(self): "UninstalledBy": uninstalledBy, } ) - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") total = len(installations) callback = {"success": "true", "result": values, "total": total, "date": timestamp} else: diff --git a/src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py b/src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py index e516fb145..323ee3a39 100644 --- a/src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py @@ -1,5 +1,5 @@ from WebAppDIRAC.Lib.WebHandler import _WebHandler as WebHandler -from DIRAC.Core.Utilities import Time +import datetime class ExampleAppHandler(WebHandler): @@ -7,7 +7,7 @@ class ExampleAppHandler(WebHandler): DEFAULT_AUTHORIZATION = "all" def web_getJobData(self): - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") total = 5 values = [ {"ExampleId": 1, "ExampleValue": "Zoli"}, diff --git a/src/WebAppDIRAC/WebApp/handler/FileCatalogHandler.py b/src/WebAppDIRAC/WebApp/handler/FileCatalogHandler.py index d0d3bb5ab..f69ebed78 100644 --- a/src/WebAppDIRAC/WebApp/handler/FileCatalogHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/FileCatalogHandler.py @@ -3,9 +3,9 @@ import random import shutil import zipfile +import datetime from DIRAC import gLogger, S_ERROR, S_OK -from DIRAC.Core.Utilities import Time from DIRAC.Resources.Catalog.FileCatalog import FileCatalog from DIRAC.DataManagementSystem.Client.DataManager import DataManager from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getVOForGroup @@ -255,7 +255,7 @@ def web_getFilesData(self, limit=25, start=0, lfnPath=None, **kwargs): "metadata": meta, } ) - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") return {"success": "true", "result": callback, "total": total, "date": timestamp} def web_getMetadataFilesInFile(self, selection="", lfnPath=None): diff --git a/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py index 93c262425..76fffb66b 100644 --- a/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/JobMonitorHandler.py @@ -1,7 +1,7 @@ import json +import datetime from DIRAC import gConfig, gLogger -from DIRAC.Core.Utilities import Time from DIRAC.Core.Utilities import DictCache from DIRAC.Core.Utilities.Graphs.Palette import Palette from DIRAC.RequestManagementSystem.Client.Request import Request @@ -83,7 +83,7 @@ def web_getJobData(self): extra = None if "Extras" in result: extra = result["Extras"] - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") extra["date"] = timestamp return {"success": "true", "result": callback, "total": total, "extra": extra} diff --git a/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py index 179e898a0..a164d304f 100644 --- a/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/PilotMonitorHandler.py @@ -1,7 +1,7 @@ import json +import datetime from DIRAC import gConfig, S_OK, gLogger -from DIRAC.Core.Utilities import Time from DIRAC.Core.Utilities.Graphs.Palette import Palette from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getUsernameForDN from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient @@ -51,7 +51,7 @@ def web_getPilotData(self): tmp[head[j]] = i[j] callback.append(tmp) total = result["TotalRecords"] - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") if "Extras" in result: return {"success": "true", "result": callback, "total": total, "extra": result["Extras"], "date": timestamp} return {"success": "true", "result": callback, "total": total, "date": timestamp} diff --git a/src/WebAppDIRAC/WebApp/handler/PilotSummaryHandler.py b/src/WebAppDIRAC/WebApp/handler/PilotSummaryHandler.py index 5af5b06ee..ba2909a97 100644 --- a/src/WebAppDIRAC/WebApp/handler/PilotSummaryHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/PilotSummaryHandler.py @@ -1,7 +1,7 @@ import json +import datetime from DIRAC import gConfig, gLogger -from DIRAC.Core.Utilities import Time from DIRAC.WorkloadManagementSystem.Client.PilotManagerClient import PilotManagerClient from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient from WebAppDIRAC.Lib.WebHandler import _WebHandler as WebHandler @@ -43,7 +43,7 @@ def web_getPilotSummaryData(self): callback.append(tmp) total = result["TotalRecords"] total = result["TotalRecords"] - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") if "Extras" in result: st = self.__dict2string({}) extra = result["Extras"] diff --git a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py index c4900326c..8ef12dc8c 100644 --- a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py @@ -1,6 +1,7 @@ import json +import datetime + from DIRAC import gConfig, gLogger -from DIRAC.Core.Utilities import Time from DIRAC.Core.Utilities.List import uniqueElements from DIRAC.FrameworkSystem.Client.ProxyManagerClient import gProxyManager @@ -95,7 +96,7 @@ def web_getProxyManagerData(self): # 'UserGroups': record['groups'], # 'ExpirationTime': str(record['expirationtime']), # 'Provider': record['provider']}) - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") data = {"success": "true", "result": proxies, "total": svcData["TotalRecords"], "date": timestamp} self.finish(data) diff --git a/src/WebAppDIRAC/WebApp/handler/RequestMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/RequestMonitorHandler.py index e78a884da..fc78fb91f 100644 --- a/src/WebAppDIRAC/WebApp/handler/RequestMonitorHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/RequestMonitorHandler.py @@ -1,7 +1,7 @@ import json +import datetime from DIRAC import gLogger -from DIRAC.Core.Utilities import Time from DIRAC.RequestManagementSystem.Client.ReqClient import ReqClient from WebAppDIRAC.Lib.WebHandler import WebHandler, asyncGen @@ -66,7 +66,7 @@ def web_getRequestMonitorData(self): callback.append(tmp) total = result["TotalRecords"] total = result["TotalRecords"] - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") if "Extras" in result: st = self.__dict2string({}) extra = result["Extras"] diff --git a/src/WebAppDIRAC/WebApp/handler/ResourceSummaryHandler.py b/src/WebAppDIRAC/WebApp/handler/ResourceSummaryHandler.py index baa3fb38f..87d7e9c24 100644 --- a/src/WebAppDIRAC/WebApp/handler/ResourceSummaryHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/ResourceSummaryHandler.py @@ -1,8 +1,8 @@ import collections import json +import datetime from DIRAC import gLogger -from DIRAC.Core.Utilities import Time from DIRAC.ResourceStatusSystem.Client.PublisherClient import PublisherClient from DIRAC.ResourceStatusSystem.PolicySystem.StateMachine import RSSMachine @@ -446,6 +446,6 @@ def web_getResourceSummaryData(self): yield self.threadTask(rssMachine.orderPolicyResults, elementList) - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") self.finish({"success": "true", "result": elementList, "total": len(elementList), "date": timestamp}) diff --git a/src/WebAppDIRAC/WebApp/handler/TokenManagerHandler.py b/src/WebAppDIRAC/WebApp/handler/TokenManagerHandler.py index f6991b2d0..b049f3451 100644 --- a/src/WebAppDIRAC/WebApp/handler/TokenManagerHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/TokenManagerHandler.py @@ -1,7 +1,7 @@ import json +import datetime from DIRAC import gConfig, gLogger -from DIRAC.Core.Utilities import Time from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getAllUsers from DIRAC.FrameworkSystem.Client.TokenManagerClient import TokenManagerClient @@ -53,7 +53,7 @@ def web_getTokenManagerData(self, username="[]", **kwargs): "ExpirationTime": str(record["rt_expires_at"]), } ) - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") return {"success": "true", "result": tokens, "total": len(tokens), "date": timestamp} def web_deleteTokens(self, idList): diff --git a/src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py index 8df5a2794..c9f27c05c 100644 --- a/src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py @@ -2,9 +2,10 @@ """ import json +import datetime from DIRAC import gConfig, gLogger -from DIRAC.Core.Utilities import Time +from DIRAC.Core.Utilities import TimeUtilities from DIRAC.TransformationSystem.Client.TransformationClient import TransformationClient from WebAppDIRAC.Lib.WebHandler import WebHandler, WErr, asyncGen @@ -93,7 +94,7 @@ def web_getSelectionData(self): @asyncGen def web_getTransformationData(self): - pagestart = Time.time() + pagestart = TimeUtilities.time() user = self.getUserName() tsClient = TransformationClient(timeout=3600) @@ -147,12 +148,12 @@ def web_getTransformationData(self): if "Extras" in result: gLogger.info(result["Extras"]) extra = result["Extras"] - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") callback = {"success": "true", "result": callback, "total": total, "extra": extra, "date": timestamp} else: callback = {"success": "true", "result": callback, "total": total, "date": None} - gLogger.info("\033[0;31m PRODUCTION SUBMIT REQUEST: \033[0m %s" % (Time.time() - pagestart)) + gLogger.info("\033[0;31m PRODUCTION SUBMIT REQUEST: \033[0m %s" % (TimeUtilities.time() - pagestart)) self.finish(json.dumps(callback)) ################################################################################ @@ -311,7 +312,7 @@ def __getLoggingInfo(self, transid): for i in result: DN = i["AuthorDN"] i["AuthorDN"] = dndb.get(DN, DN) - date = Time.toString(i["MessageDate"]) + date = TimeUtilities.toString(i["MessageDate"]) callback.append([i["Message"], date, i["AuthorDN"]]) callback = {"success": "true", "result": callback} else: @@ -405,7 +406,7 @@ def web_showFileStatus(self): tmp = {head[j]: i[j] for j in range(headLength)} callback.append(tmp) total = result["TotalRecords"] - timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") if "Extras" in result: extra = result["Extras"] callback = { diff --git a/src/WebAppDIRAC/WebApp/handler/VMDiracHandler.py b/src/WebAppDIRAC/WebApp/handler/VMDiracHandler.py index 6acb0c2ee..d3d502321 100644 --- a/src/WebAppDIRAC/WebApp/handler/VMDiracHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/VMDiracHandler.py @@ -1,7 +1,7 @@ import ast import json -from DIRAC.Core.Utilities import Time +from DIRAC.Core.Utilities import TimeUtilities from WebAppDIRAC.Lib.WebHandler import WebHandler, asyncGen from DIRAC.WorkloadManagementSystem.Client.VMClient import VMClient @@ -99,12 +99,12 @@ def web_getHistoryValues(self): return svcData = result["Value"] data = [] - olderThan = Time.toEpoch() - 400 + olderThan = TimeUtilities.toEpoch() - 400 for record in svcData["Records"]: rL = [] for iP in range(len(svcData["ParameterNames"])): param = svcData["ParameterNames"][iP] - rL.append(Time.toEpoch(record[iP]) if param == "Update" else record[iP]) + rL.append(TimeUtilities.toEpoch(record[iP]) if param == "Update" else record[iP]) if rL[0] < olderThan: data.append(rL) self.finish({"success": "true", "data": data, "fields": svcData["ParameterNames"]}) @@ -124,10 +124,10 @@ def web_getRunningInstancesHistory(self): return svcData = result["Value"] data = [] - olderThan = Time.toEpoch() - 400 + olderThan = TimeUtilities.toEpoch() - 400 rL = [] for record in svcData: - eTime = Time.toEpoch(record[0]) + eTime = TimeUtilities.toEpoch(record[0]) if eTime < olderThan: rL = [eTime, int(record[1])] data.append(rL) @@ -148,9 +148,9 @@ def web_getRunningInstancesBEPHistory(self): return svcData = result["Value"] data = [] - olderThan = Time.toEpoch() - 400 + olderThan = TimeUtilities.toEpoch() - 400 for record in svcData: - eTime = Time.toEpoch(record[0]) + eTime = TimeUtilities.toEpoch(record[0]) if eTime < olderThan: rL = [eTime, record[1], int(record[2])] data.append(rL) @@ -171,9 +171,9 @@ def web_getRunningInstancesByRunningPodHistory(self): return svcData = result["Value"] data = [] - olderThan = Time.toEpoch() - 400 + olderThan = TimeUtilities.toEpoch() - 400 for record in svcData: - eTime = Time.toEpoch(record[0]) + eTime = TimeUtilities.toEpoch(record[0]) if eTime < olderThan: rL = [eTime, record[1], int(record[2])] data.append(rL) @@ -194,9 +194,9 @@ def web_getRunningInstancesByImageHistory(self): return svcData = result["Value"] data = [] - olderThan = Time.toEpoch() - 400 + olderThan = TimeUtilities.toEpoch() - 400 for record in svcData: - eTime = Time.toEpoch(record[0]) + eTime = TimeUtilities.toEpoch(record[0]) if eTime < olderThan: rL = [eTime, record[1], int(record[2])] data.append(rL) From 109a33944d2744da924d804368cf1c4b5712f639 Mon Sep 17 00:00:00 2001 From: rupozzi Date: Fri, 20 May 2022 15:26:09 +0200 Subject: [PATCH 2/3] fix: Removed usage of Utilities.Time --- src/WebAppDIRAC/WebApp/handler/AccountingHandler.py | 12 ++++++------ .../WebApp/handler/ConfigurationManagerHandler.py | 5 +++-- .../static/DIRAC/ExampleApp/classes/ExampleApp.js | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/WebAppDIRAC/WebApp/handler/AccountingHandler.py b/src/WebAppDIRAC/WebApp/handler/AccountingHandler.py index 20cb014b1..2fb85d386 100644 --- a/src/WebAppDIRAC/WebApp/handler/AccountingHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/AccountingHandler.py @@ -4,7 +4,7 @@ import tempfile from DIRAC import gConfig, S_OK, S_ERROR -from DIRAC.Core.Utilities import Time, List, DictCache +from DIRAC.Core.Utilities import TimeUtilities, List, DictCache from DIRAC.Core.Utilities.Plotting.FileCoding import extractRequestFromFileId, codeRequestInFileId from DIRAC.AccountingSystem.Client.ReportsClient import ReportsClient from DIRAC.Core.Tornado.Client.ClientSelector import TransferClientSelector as TransferClient @@ -136,7 +136,7 @@ def __parseFormParams(self, timeSelector, typeName=None, **pD): # Find the proper time! pD["timeSelector"] = timeSelector if pD["timeSelector"] > 0: - end = Time.dateTime() + end = datetime.datetime.utcnow() start = end - datetime.timedelta(seconds=pD["timeSelector"]) if not pinDates: extraParams["lastSeconds"] = pD["timeSelector"] @@ -144,11 +144,11 @@ def __parseFormParams(self, timeSelector, typeName=None, **pD): end = False if "endTime" in pD: - end = Time.fromString(pD["endTime"]) + end = TimeUtilities.fromString(pD["endTime"]) del pD["endTime"] if "startTime" not in pD: return S_ERROR("Missing starTime!") - start = Time.fromString(pD["startTime"]) + start = TimeUtilities.fromString(pD["startTime"]) del pD["startTime"] del pD["timeSelector"] @@ -290,10 +290,10 @@ def web_getCsvPlotData(self, typeName, plotName, timeSelector: int, grouping, ** if "granularity" in rawData: granularity = rawData["granularity"] data = rawData["data"] - tS = int(Time.toEpoch(start)) + tS = int(TimeUtilities.toEpoch(start)) timeStart = tS - tS % granularity strData = "epoch,%s\n" % ",".join(groupKeys) - for timeSlot in range(timeStart, int(Time.toEpoch(end)), granularity): + for timeSlot in range(timeStart, int(TimeUtilities.toEpoch(end)), granularity): lineData = [str(timeSlot)] for key in groupKeys: lineData.append(str(data[key][timeSlot]) if timeSlot in data[key] else "") diff --git a/src/WebAppDIRAC/WebApp/handler/ConfigurationManagerHandler.py b/src/WebAppDIRAC/WebApp/handler/ConfigurationManagerHandler.py index 44bce6214..dd113cd6b 100644 --- a/src/WebAppDIRAC/WebApp/handler/ConfigurationManagerHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/ConfigurationManagerHandler.py @@ -1,10 +1,11 @@ import json +import datetime from diraccfg import CFG from DIRAC import gConfig from DIRAC.ConfigurationSystem.Client.ConfigurationClient import ConfigurationClient -from DIRAC.Core.Utilities import Time, List +from DIRAC.Core.Utilities import List from DIRAC.ConfigurationSystem.private.Modificator import Modificator from WebAppDIRAC.Lib.WebHandler import WebSocketHandler, WErr, asyncGen @@ -602,7 +603,7 @@ def __setCommiter(self): commiter = "%s@%s - %s" % ( self.getUserName(), self.getUserGroup(), - Time.dateTime().strftime("%Y-%m-%d %H:%M:%S"), + datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S"), ) self.__configData["cfgData"].commiterId = commiter diff --git a/src/WebAppDIRAC/WebApp/static/DIRAC/ExampleApp/classes/ExampleApp.js b/src/WebAppDIRAC/WebApp/static/DIRAC/ExampleApp/classes/ExampleApp.js index 25cea0399..2ab73ea2e 100644 --- a/src/WebAppDIRAC/WebApp/static/DIRAC/ExampleApp/classes/ExampleApp.js +++ b/src/WebAppDIRAC/WebApp/static/DIRAC/ExampleApp/classes/ExampleApp.js @@ -11,8 +11,8 @@ * ExampleHandler.py: * from WebAppDIRAC.Lib.WebHandler import WebHandler, WErr, asyncGen * from DIRAC import gConfig, S_OK, S_ERROR, gLogger - * from DIRAC.Core.Utilities import Time * import json + * import datetime * * class ExampleAppHandler(WebHandler): * @@ -20,7 +20,7 @@ * * @asyncGen * def web_getJobData(self): - * timestamp = Time.dateTime().strftime("%Y-%m-%d %H:%M [UTC]") + * timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") * total = 5 * values = [] * values = [{"ExampleId":1,"ExampleValue":"Zoli"},{"ExampleId":2,"ExampleValue":'a'},{"ExampleId":3,"ExampleValue":'aaaa'},{"ExampleId":4,"ExampleValue":'bbbb'},{"ExampleId":5,"ExampleValue":'adsd'}] From bd0b1766b3654362a9ca04829695f78bcf5bfb85 Mon Sep 17 00:00:00 2001 From: rupozzi Date: Fri, 20 May 2022 15:46:35 +0200 Subject: [PATCH 3/3] fix: Removed TimeUtilities.time() --- src/WebAppDIRAC/WebApp/handler/MonitoringHandler.py | 12 ++++++------ .../WebApp/handler/TransformationMonitorHandler.py | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/WebAppDIRAC/WebApp/handler/MonitoringHandler.py b/src/WebAppDIRAC/WebApp/handler/MonitoringHandler.py index fc37bf89a..1838a0be5 100644 --- a/src/WebAppDIRAC/WebApp/handler/MonitoringHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/MonitoringHandler.py @@ -5,7 +5,7 @@ from DIRAC import gConfig, S_OK, S_ERROR, gLogger from DIRAC.Core.Tornado.Client.ClientSelector import TransferClientSelector as TransferClient -from DIRAC.Core.Utilities import Time, List, DictCache +from DIRAC.Core.Utilities import TimeUtilities, List, DictCache from DIRAC.Core.Utilities.Plotting.FileCoding import extractRequestFromFileId, codeRequestInFileId from DIRAC.MonitoringSystem.Client.MonitoringClient import MonitoringClient @@ -109,7 +109,7 @@ def __parseFormParams(self): # Find the proper time! pD["timeSelector"] = int(pD["timeSelector"]) if pD["timeSelector"] > 0: - end = Time.dateTime() + end = datetime.datetime.utcnow() start = end - datetime.timedelta(seconds=pD["timeSelector"]) if not pinDates: extraParams["lastSeconds"] = pD["timeSelector"] @@ -117,12 +117,12 @@ def __parseFormParams(self): if "endTime" not in pD: end = False else: - end = Time.fromString(pD["endTime"]) + end = TimeUtilities.fromString(pD["endTime"]) del pD["endTime"] if "startTime" not in pD: return S_ERROR("Missing starTime!") else: - start = Time.fromString(pD["startTime"]) + start = TimeUtilities.fromString(pD["startTime"]) del pD["startTime"] del pD["timeSelector"] @@ -233,10 +233,10 @@ def web_getCsvPlotData(self): if "granularity" in rawData: granularity = rawData["granularity"] data = rawData["data"] - tS = int(Time.toEpoch(params[2])) + tS = int(TimeUtilities.toEpoch(params[2])) timeStart = tS - tS % granularity strData = "epoch,%s\n" % ",".join(groupKeys) - for timeSlot in range(timeStart, int(Time.toEpoch(params[3])), granularity): + for timeSlot in range(timeStart, int(TimeUtilities.toEpoch(params[3])), granularity): lineData = [str(timeSlot)] for key in groupKeys: if timeSlot in data[key]: diff --git a/src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py b/src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py index c9f27c05c..852fcd2b6 100644 --- a/src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/TransformationMonitorHandler.py @@ -94,7 +94,7 @@ def web_getSelectionData(self): @asyncGen def web_getTransformationData(self): - pagestart = TimeUtilities.time() + pagestart = datetime.datetime.utcnow() user = self.getUserName() tsClient = TransformationClient(timeout=3600) @@ -153,7 +153,7 @@ def web_getTransformationData(self): else: callback = {"success": "true", "result": callback, "total": total, "date": None} - gLogger.info("\033[0;31m PRODUCTION SUBMIT REQUEST: \033[0m %s" % (TimeUtilities.time() - pagestart)) + gLogger.info("\033[0;31m PRODUCTION SUBMIT REQUEST: \033[0m %s" % (datetime.datetime.utcnow() - pagestart)) self.finish(json.dumps(callback)) ################################################################################