Skip to content
This repository has been archived by the owner on Feb 14, 2023. It is now read-only.

Fixed issue with location and name of gMonitor and InstallTools #168

Open
wants to merge 1 commit into
base: integration
Choose a base branch
from
Open

Fixed issue with location and name of gMonitor and InstallTools #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions dirac/config/environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ def initDIRAC( rootPath, enableDebug = False ):
gLogger.initialize( "Web", "/Website" )
gLogger.setLevel( "VERBOSE" )

from DIRAC import gMonitor, gConfig, rootPath as droot
from DIRAC import gConfig, rootPath as droot
from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
from DIRAC.Core.Utilities import CFG
from DIRAC.ConfigurationSystem.Client.Helpers import getCSExtensions
gMonitor.setComponentType( gMonitor.COMPONENT_WEB )
Expand Down Expand Up @@ -152,10 +153,10 @@ def getRelease( rootPath ):

def portalVersion( rootPath ):

from DIRAC.Core.Utilities import InstallTools
from DIRAC.FrameworkSystem.Client.ComponentInstaller import gComponentInstaller
from DIRAC.ConfigurationSystem.Client.Helpers.CSGlobals import getCSExtensions

result = InstallTools.getInfo( getCSExtensions() )
result = gComponentInstaller.getInfo( getCSExtensions() )

if not result[ "OK" ]:
return getRelease( rootPath )
Expand Down
7 changes: 4 additions & 3 deletions dirac/lib/webBase.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
from dirac.lib.webconfig import gWebConfig
import dirac.lib.helpers as helpers
from pylons import request
from DIRAC import gMonitor, gLogger
from DIRAC import gLogger
from DIRAC.FrameworkSystem.Client.MonitoringClient import gMonitor
from DIRAC.ConfigurationSystem.Client.Helpers.CSGlobals import getCSExtensions
from DIRAC.Core.Utilities import InstallTools
from DIRAC.FrameworkSystem.Client.ComponentInstaller import gComponentInstaller


def currentPath():
Expand Down Expand Up @@ -143,7 +144,7 @@ def getSetups():
return "[%s]" % ",".join( availableSetups )

def getVersion():
result = InstallTools.getInfo( getCSExtensions() )
result = gComponentInstaller.getInfo( getCSExtensions() )
if not result[ "OK" ]:
return ""

Expand Down