Skip to content
Snippets Groups Projects
Commit e2960cc5 authored by anttil's avatar anttil
Browse files

SSDM-3238: Dropbox Monitor doesn't find log registrations folder

SVN: 35875
parent 53c08bf9
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,7 @@ def process(tr, parameters, tableBuilder): ...@@ -22,7 +22,7 @@ def process(tr, parameters, tableBuilder):
rootDirectory = getRootDir(tr) rootDirectory = getRootDir(tr)
dropboxesList = listAllDropboxes() dropboxesList = listAllDropboxes()
logDirectory = getLogsDir(rootDirectory) logDirectory = getLogsDir(tr)
dropboxInProcess = os.listdir(os.path.join(logDirectory, "in-process")) dropboxInProcess = os.listdir(os.path.join(logDirectory, "in-process"))
dropboxFailed = os.listdir(os.path.join(logDirectory, "failed")) dropboxFailed = os.listdir(os.path.join(logDirectory, "failed"))
...@@ -55,8 +55,13 @@ def process(tr, parameters, tableBuilder): ...@@ -55,8 +55,13 @@ def process(tr, parameters, tableBuilder):
detailInfoBuilder.buildRow(detailInfoMap) detailInfoBuilder.buildRow(detailInfoMap)
def getLogsDir(rootDirectory): def getLogsDir(tr):
return os.path.join(rootDirectory, "servers/datastore_server/log-registrations") defaultDir = System.getProperty("user.dir")
dir = getProperty(tr, "dss-registration-log-dir")
if dir is None:
return os.path.join(defaultDir, "log-registrations")
else:
return dir
def listAllDropboxes(): def listAllDropboxes():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment