Skip to content

Fix /ok, update to 1.29 #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DrDaveD merged 2 commits into from
Feb 10, 2025
Merged

Fix /ok, update to 1.29 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a50e362
fix the /ok test
DrDaveD Feb 10, 2025
0213fe6
update to 1.29
DrDaveD Feb 10, 2025
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
5 changes: 4 additions & 1 deletion rpm/cvmfs-servermon.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Summary: CernVM File System Server Monitoring
Name: cvmfs-servermon
Version: 1.28
Version: 1.29
# The release_prefix macro is used in the OBS prjconf, don't change its name
%define release_prefix 1
Release: %{release_prefix}%{?dist}
Expand Down Expand Up @@ -68,6 +68,9 @@ setsebool -P httpd_can_network_connect 1 2>/dev/null || true
/usr/share/cvmfs-servermon

%changelog
* Mon Feb 10 2025 Dave Dykstra <dwd@fnal.gov> - 1.29-1
- Fix the /ok api, which was showing nothing.

* Mon Sep 2 2024 Dave Dykstra <dwd@fnal.gov> - 1.28-1
- Prevent json pretty printer from breaking up long strings, the way
pyhon2 did it.
Expand Down
4 changes: 2 additions & 2 deletions webapi/cvmfsmon_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,8 @@ def dispatch(version, montests, parameters, start_response, environ):
for repo in replicas_and_repos:
if repo in excludes:
continue
results = []
if montests == 'ok':
results.append([ 'ok', repo, 'OK', '' ])
allresults.append([ 'ok', repo, 'OK', '' ])
continue
errormsg = ""
doupdated = False
Expand Down Expand Up @@ -245,6 +244,7 @@ def dispatch(version, montests, parameters, start_response, environ):
except:
errormsg = str(sys.exc_info()[1])

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

Expand Down