Skip to content

Commit c7d6884

Browse files
authored
Merge pull request #61 from DrDaveD/fix-ok
Fix /ok, update to 1.29
2 parents 0a3224f + 0213fe6 commit c7d6884

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

rpm/cvmfs-servermon.spec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Summary: CernVM File System Server Monitoring
22
Name: cvmfs-servermon
3-
Version: 1.28
3+
Version: 1.29
44
# The release_prefix macro is used in the OBS prjconf, don't change its name
55
%define release_prefix 1
66
Release: %{release_prefix}%{?dist}
@@ -68,6 +68,9 @@ setsebool -P httpd_can_network_connect 1 2>/dev/null || true
6868
/usr/share/cvmfs-servermon
6969

7070
%changelog
71+
* Mon Feb 10 2025 Dave Dykstra <dwd@fnal.gov> - 1.29-1
72+
- Fix the /ok api, which was showing nothing.
73+
7174
* Mon Sep 2 2024 Dave Dykstra <dwd@fnal.gov> - 1.28-1
7275
- Prevent json pretty printer from breaking up long strings, the way
7376
pyhon2 did it.

webapi/cvmfsmon_api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,8 @@ def dispatch(version, montests, parameters, start_response, environ):
203203
for repo in replicas_and_repos:
204204
if repo in excludes:
205205
continue
206-
results = []
207206
if montests == 'ok':
208-
results.append([ 'ok', repo, 'OK', '' ])
207+
allresults.append([ 'ok', repo, 'OK', '' ])
209208
continue
210209
errormsg = ""
211210
doupdated = False
@@ -245,6 +244,7 @@ def dispatch(version, montests, parameters, start_response, environ):
245244
except:
246245
errormsg = str(sys.exc_info()[1])
247246

247+
results = []
248248
if domontest('check', montests):
249249
results.append(cvmfsmon_check.runtest(repo, repo_status, errormsg))
250250

0 commit comments

Comments
 (0)