[checkmk-commits] Check_MK Git: check_mk: FIX: Distributed WATO: Supressing site sync progress output written in the apache error log

Module: check_mk Branch: master Commit: 0c871029825aba53fb1b1f031af7f0f96b8b6c55 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0c871029825aba… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 23 11:09:16 2011 +0100 FIX: Distributed WATO: Supressing site sync progress output written in the apache error log --- ChangeLog | 6 +++--- web/htdocs/wato.py | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ffe56f..1657d3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,11 +8,9 @@ order to be consistent with other checks Multisite: - * FIX: ship missing CSS files for mobile GUI - - Multisite: * Several cleanups to prevent css/js warning messages in e.g. Firefox * Made texts in selectable rows selectable again + * FIX: ship missing CSS files for mobile GUI WATO: * Optimized wraps in host lists tag column @@ -25,6 +23,8 @@ * FIX: Fixed javascript errors when doing replication in distributed wato environments when not having the sidebar open * You can now move folders to other folders + * FIX: Distributed WATO: Supressing site sync progress output written in + the apache error log 1.1.13i1: Multisite: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3ab9ad0..6c72300 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6868,7 +6868,8 @@ def push_snapshot_to_site(site, do_restart): # urllib2 does not seem to support file uploads. Please tell me, if # you know a better method for uploading, without the use of external # programs... - response_text = os.popen("curl -F snapshot=@%s '%s'" % (sync_snapshot_file, url)).read() + # -s -S: Disable progress meter but enable error messages + response_text = os.popen("curl -s -S -F snapshot=@%s '%s'" % (sync_snapshot_file, url)).read() try: response = eval(response_text) return response