diff options
| author | Sergey Poznyakoff <gray@gnu.org> | 2019-07-22 14:53:37 +0300 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org> | 2019-07-22 14:53:37 +0300 |
| commit | b369ed6ad26c07d3aec65a1bf0910c0d828c400f (patch) | |
| tree | 525b13a5bbda244cbec3fe10c25c47aa2975e2a5 /src/wydawca.c | |
| parent | 0917d1276103d9cc893e8ac091e9e63c5e6182f8 (diff) | |
| download | wydawca-b369ed6ad26c07d3aec65a1bf0910c0d828c400f.tar.gz wydawca-b369ed6ad26c07d3aec65a1bf0910c0d828c400f.tar.bz2 | |
Finish mod_logstat implementation. Document it.
* doc/wydawca.texi: Document mod_logstat.
* include/wydawca/wydawca.h (wy_ev_statistics): Rename to
wy_ev_finish. All uses changed.
(wydawca_stat): New enum (from src/wydawca.h)
(WY_STAT_MASK,WY_STAT_MASK_NONE)
(WY_STAT_MASK_ALL): New macros.
All uses changed.
* modules/logstat/mod_logstat.c (stat_mask): Default to WY_STAT_MASK_ALL.
(wy_notify): Provide default output.
Diffstat (limited to 'src/wydawca.c')
| -rw-r--r-- | src/wydawca.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/wydawca.c b/src/wydawca.c index 4bd3620..00d779c 100644 --- a/src/wydawca.c +++ b/src/wydawca.c @@ -52,7 +52,7 @@ char *wy_gpg_homedir; char *default_check_script; struct grecs_sockaddr listen_sockaddr; -unsigned wydawca_stat[MAX_STAT]; +unsigned wydawca_stat[WY_MAX_STAT]; unsigned min_directive_version = MIN_DIRECTIVE_VERSION; unsigned max_directive_version = MAX_DIRECTIVE_VERSION; @@ -117,11 +117,11 @@ wy_log(int prio, char *fmt, ...) case LOG_ALERT: case LOG_CRIT: case LOG_ERR: - UPDATE_STATS(STAT_ERRORS); + UPDATE_STATS(WY_STAT_ERRORS); break; case LOG_WARNING: - UPDATE_STATS(STAT_WARNINGS); + UPDATE_STATS(WY_STAT_WARNINGS); } va_start(ap, fmt); @@ -140,7 +140,7 @@ wy_dbg(char *fmt, ...) } -static char *stat_name[MAX_STAT] = { +static char *stat_name[WY_MAX_STAT] = { N_("errors"), N_("warnings"), N_("bad signatures"), @@ -157,7 +157,7 @@ static char *stat_name[MAX_STAT] = { N_("check failures"), }; -static char *stat_kwname[MAX_STAT] = { +static char *stat_kwname[WY_MAX_STAT] = { "stat:errors", "stat:warnings", "stat:bad_signatures", @@ -179,8 +179,8 @@ wy_stat_mask_p(unsigned long mask) { int i; - for (i = 0; i < MAX_STAT; i++) - if (wydawca_stat[i] != 0 && (mask && STAT_MASK(i))) + for (i = 0; i < WY_MAX_STAT; i++) + if (wydawca_stat[i] != 0 && (mask && WY_STAT_MASK(i))) return 1; return 0; } @@ -202,9 +202,9 @@ make_stat_expansion(size_t count) { int i; struct wy_metadef *def, *p; - def = grecs_calloc(MAX_STAT + count + 1, sizeof(def[0])); + def = grecs_calloc(WY_MAX_STAT + count + 1, sizeof(def[0])); p = def + count; - for (i = 0; i < MAX_STAT; i++, p++) { + for (i = 0; i < WY_MAX_STAT; i++, p++) { p->kw = stat_kwname[i]; p->value = NULL; p->storage = NULL; @@ -221,13 +221,13 @@ logstats() int i; if (wy_stat_mask_p(print_stats)) { - for (i = 0; i < MAX_STAT; i++) - if (print_stats & STAT_MASK(i)) + for (i = 0; i < WY_MAX_STAT; i++) + if (print_stats & WY_STAT_MASK(i)) wy_log(LOG_INFO, "%s: %u", gettext(stat_name[i]), wydawca_stat[i]); } - notify_stats(); + notify_finish(); } void |