diff options
| author | Martin Schwenke <martin@meltin.net> | 2010-12-16 10:11:33 +1100 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-11 10:46:56 +1000 |
| commit | 1b956b2b0a97dde23f97f39976381cf1cfa9bb42 (patch) | |
| tree | a91ac0f34c9a4c561011bfa6ab36f9b20d43bc19 | |
| parent | 217edfa1c8dacbbfaf913b34085355f11bcaf557 (diff) | |
| download | samba-1b956b2b0a97dde23f97f39976381cf1cfa9bb42.tar.gz samba-1b956b2b0a97dde23f97f39976381cf1cfa9bb42.tar.xz samba-1b956b2b0a97dde23f97f39976381cf1cfa9bb42.zip | |
Eventscript functions: fix counter regression.
d362be7d32079ac1390d67056ce107bfbca2c937 wasn't well thought out.
Subsequent commits depend on ctdb_counter_init() taking an argument,
so this makes those cases work.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 05a8fcfbac3da2b5843b31e0fe258255cc761190)
| -rwxr-xr-x | ctdb/config/functions | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions index 9b19548b13..b26a78fe04 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -520,18 +520,18 @@ _ctdb_counter_common () { mkdir -p "${_counter_file%/*}" # dirname } ctdb_counter_init () { - _ctdb_counter_common "$@" + _ctdb_counter_common "$1" >"$_counter_file" } ctdb_counter_incr () { - _ctdb_counter_common "$@" + _ctdb_counter_common "$1" # unary counting! echo -n 1 >> "$_counter_file" } ctdb_check_counter_limit () { - _ctdb_counter_common "$@" + _ctdb_counter_common _limit="${1:-${service_fail_limit}}" _quiet="$2" @@ -546,7 +546,7 @@ ctdb_check_counter_limit () { fi } ctdb_check_counter_equal () { - _ctdb_counter_common "$@" + _ctdb_counter_common _limit=$1 |