[checkmk-commits] [Checkmk/checkmk] 0f0602: don't check for files if result is ignored

Branch: refs/heads/master Home: https://github.com/Checkmk/checkmk Commit: 0f0602c33281d78185b7f20c574a664a560ae378 https://github.com/Checkmk/checkmk/commit/0f0602c33281d78185b7f20c574a664a5… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: M cmk/gui/htmllib/html.py Log Message: ----------- don't check for files if result is ignored why check if files exists if result will not be used? Change-Id: Ib1215970ea9fc8e2552ebcebb5ae37ed52063f92 Commit: b4238812e1dbda0c7e316718f92a49fb18286fe1 https://github.com/Checkmk/checkmk/commit/b4238812e1dbda0c7e316718f92a49fb1… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: M cmk/gui/htmllib/html.py Log Message: ----------- rename _exists_in_web_dirs; debug mode more explicit * renamed _exists_in_web_dirs to _verify_file_exists_in_web_dirs to make it clear that this function throws an exception * move the "not current_app.debug" to the call sites of this function to make it more clear that this is only executed in debug mode. Change-Id: I4b3beb06526d1431dcee2dfb4d7052a1af859015 Commit: 84625ff941217fae2e3d3e4de3f159f6ec7cf106 https://github.com/Checkmk/checkmk/commit/84625ff941217fae2e3d3e4de3f159f6e… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: A .werks/15288 M cmk/gui/htmllib/html.py Log Message: ----------- 15288 Remove HTMLGenerator.add_default_javascript function MKPs that use custom javascript code may be affected by this change. A typical usage of this function may look like: C+: html.add_default_javascript("custom_id") C-: There is no 1:1 replacement for this call, but several ways to do similar things: C+: html.javascript("inlined_javascript_code();") C-: C+: html.javascript_file("browser/path/to_javascriptfile.js") C-: Change-Id: Iabfc133e88f026a6d11649ebabfdc5ac8a0cfe4b Commit: 8ed7bb369e6f949a1fcba14653bdbc270c5d4d3e https://github.com/Checkmk/checkmk/commit/8ed7bb369e6f949a1fcba14653bdbc270… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: M cmk/gui/htmllib/header.py M cmk/gui/htmllib/html.py M cmk/gui/sidebar/__init__.py Log Message: ----------- remove clear_default_javascript function this mechanism seems overly complicated Change-Id: I550c04626c218c41a1bb100f26f881adce024c25 Commit: 30cc97c1d94c1487fb3a4d88eee7ab8968080894 https://github.com/Checkmk/checkmk/commit/30cc97c1d94c1487fb3a4d88eee7ab896… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: M cmk/gui/htmllib/header.py M cmk/gui/htmllib/html.py M cmk/gui/login.py M cmk/gui/wato/pages/user_profile/two_factor.py Log Message: ----------- remove additional_javascripts as it is not used Change-Id: Ice36dea90c890c7e9877e16dac32e2db11f4bbcc Commit: 9e2160819e46632bac6b8043479e42e990e0933c https://github.com/Checkmk/checkmk/commit/9e2160819e46632bac6b8043479e42e99… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: M cmk/gui/htmllib/html.py Log Message: ----------- remove code that does not work as intended a) filename_for_browser never exists in web dir b) _verify_file_exists_in_web_dirs part only throws exception if not in debug mode So for production this function always returned the filename and never None. I guess then its save to remove the complicated code. There is also no differentiation between OMD and non OMD environments so the comment seems to be outdated. Added a HTMLGenerator._verify_file_exists_in_web_dirs call analog to the function which returns the browser filename for css files. Change-Id: If719061382b143b46286f62299bf907b45e97dee Commit: 1f4572aeee9fe8c651a6bcfc6e3935139be17bf3 https://github.com/Checkmk/checkmk/commit/1f4572aeee9fe8c651a6bcfc6e3935139… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: M cmk/gui/htmllib/html.py Log Message: ----------- *_filename_for_browser can not return None So we don't have to check for None or falsy values. Change-Id: I50c7ed2919bef0bd114cd752a86b932be6625a5f Commit: 18ff53e27ef5c4707a731fa040cec32cdf91f6fd https://github.com/Checkmk/checkmk/commit/18ff53e27ef5c4707a731fa040cec32cd… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: M cmk/gui/htmllib/html.py Log Message: ----------- move htdocs to _css_filename_for_browser function this should ease handling of file paths as now the browser and for the _exists_in_web_dirs share the same root path. also rename file_name to file_path to reflect it's actual content Change-Id: I6fabf5388173083d45fd80f76cf571fc6ef6638d Commit: 82641c9392f8129338b11e948f7d99c15029505e https://github.com/Checkmk/checkmk/commit/82641c9392f8129338b11e948f7d99c15… Author: Benedikt Seidl <benedikt.seidl(a)checkmk.com> Date: 2023-08-21 (Mon, 21 Aug 2023) Changed paths: M cmk/gui/htmllib/html.py M omd/packages/check_mk/skel/etc/check_mk/apache.conf Log Message: ----------- use query to bust caches This might lower performance for people behind proxies, as the default configuration for some proxies do not cache paths with query part. But it simplifies the configuration of apache and other parts of the code. In the long run we will add hashes to our filenames on disk and will remove the _append_cache_busting_query for our internal files. Change-Id: I4d41d528a1ab26af4cd8449c1fc0d00781fae735 Compare: https://github.com/Checkmk/checkmk/compare/d9d0a24bd02d...82641c9392f8