6409c07939
- Remove salt-minion python2 requirement when python3 is default (bsc#1081592) - Remove-obsolete-unicode-handling-in-pkg.info_installed - Added: * remove-obsolete-unicode-handling-in-pkg.info_install.patch - Update to salt-2018.1.99 - Modified: * activate-all-beacons-sources-config-pillar-grains.patch * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch * feat-add-grain-for-all-fqdns.patch * fix-bsc-1065792.patch * list_pkgs-add-parameter-for-returned-attribute-selec.patch * run-salt-api-as-user-salt-bsc-1064520.patch * run-salt-master-as-dedicated-salt-user.patch - Deleted: * python3-compatibility-fix-got-bytes-instead-of-strin.patch * enable-with-salt-version-parameter-for-setup.py-scri.patch * catching-error-when-pidfile-cannot-be-deleted.patch * bugfix-always-return-a-string-list-on-unknown-job-ta.patch * bugfix-the-logic-according-to-the-exact-described-pu.patch * cherrypy-read-reads-bytes-from-the-wire-and-write-th.patch * fix-for-delete_deployment-in-kubernetes-module.patch * fix-salt-master-for-old-psutil.patch * introduce-process_count_max-minion-configuration-par.patch * multiprocessing-minion-option-documentation-fixes.patch * older-logrotate-need-su-directive.patch * return-error-when-gid_from_name-and-group-does-not-e.patch * set-shell-environment-variable-64.patch * split-only-strings-if-they-are-such.patch OBS-URL: https://build.opensuse.org/request/show/581002 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=112
27 lines
926 B
Diff
27 lines
926 B
Diff
From 8507ed69aceb38020ed41b3e0c738c4ca516f431 Mon Sep 17 00:00:00 2001
|
|
From: Hubert Mantel <mantel@suse.de>
|
|
Date: Mon, 27 Nov 2017 13:55:13 +0100
|
|
Subject: [PATCH] avoid excessive syslogging by watchdog cronjob (#58)
|
|
|
|
---
|
|
pkg/suse/salt-minion | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pkg/suse/salt-minion b/pkg/suse/salt-minion
|
|
index 2e418094ed..73a91ebd62 100755
|
|
--- a/pkg/suse/salt-minion
|
|
+++ b/pkg/suse/salt-minion
|
|
@@ -55,7 +55,7 @@ WATCHDOG_CRON="/etc/cron.d/salt-minion"
|
|
|
|
set_watchdog() {
|
|
if [ ! -f $WATCHDOG_CRON ]; then
|
|
- echo -e '* * * * * root /usr/bin/salt-daemon-watcher --with-init\n' > $WATCHDOG_CRON
|
|
+ echo -e '-* * * * * root /usr/bin/salt-daemon-watcher --with-init\n' > $WATCHDOG_CRON
|
|
# Kick the watcher for 1 minute immediately, because cron will wake up only afterwards
|
|
/usr/bin/salt-daemon-watcher --with-init & disown
|
|
fi
|
|
--
|
|
2.16.1
|
|
|
|
|