Skip to content

Commit 1357d30

Browse files
committed
fetchers: Allow OBS logs at an alternate URL
1 parent a26d414 commit 1357d30

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

checks/utils/fetchers.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,11 @@ def getDescription(lines):
5858

5959
def matchObs(url):
6060
return re.match(
61-
r"(?i)\b((?:https?:(?:/{1,3}(www\.)?obsproject\.com)/logs/)(.{16}))", url)
61+
r"(?i)\b(?P<obsLogURL>(?P<obsLogURLRoot>https?:(?:/{1,3}(?:www\.)?obsproject\.com)/(analyzer|logs))/(?P<obsLogURLFilename>.{16}))", url)
6262

6363

64-
def getObslog(obslogId):
65-
API_URL = "https://obsproject.com/logs"
66-
return requests.get('{0}/{1}'.format(API_URL, obslogId)).text
64+
def getObslog(obsURL, obslogId):
65+
return requests.get('{0}/{1}'.format(obsURL, obslogId)).text
6766

6867

6968
def getLinesObslog(obslogText):

loganalyzer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def doAnalysis(url=None, filename=None):
9898
messages.append(getDescription(logLines))
9999
success = True
100100
elif (obs):
101-
obslogObject = getObslog(obs.groups()[-1])
101+
obslogObject = getObslog(obs['obsLogURLRoot'], obs['obsLogURLFilename'])
102102
logLines = getLinesObslog(obslogObject)
103103
messages.append(getDescription(logLines))
104104
success = True

0 commit comments

Comments
 (0)