diff options
| author | Stefan Eissing <icing@apache.org> | 2017-12-13 15:04:20 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2017-12-13 15:04:20 +0000 |
| commit | 3a35f8443bc5d09a2fff7bdad48c691c2416c33f (patch) | |
| tree | fb9098325d78bb0a8e44ca0cddb51930688d03ca | |
| parent | a5a2b250677901e38a20848779cd3a92c892b9f9 (diff) | |
| download | httpd-3a35f8443bc5d09a2fff7bdad48c691c2416c33f.tar.gz | |
On the 2.4.x-mod_md branch:
Merge of r1818030 from trunk for modules/md, missing log tags
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-mod_md@1818031 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | modules/md/mod_md.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/md/mod_md.c b/modules/md/mod_md.c index f1447995c4..e01c9ea61e 100644 --- a/modules/md/mod_md.c +++ b/modules/md/mod_md.c @@ -282,7 +282,7 @@ static apr_status_t assign_to_servers(md_t *md, server_rec *base_server, /* We require https for this MD, but do we have port 443 (or a mapped one) * available? */ if (mc->local_443 <= 0) { - ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, 0, base_server, APLOGNO(10105) "MDPortMap says there is no port for https (443), " "but MD %s is configured to require https. This " "only works when a 443 port is available.", md->name); @@ -304,7 +304,7 @@ static apr_status_t assign_to_servers(md_t *md, server_rec *base_server, if (!s_https) { /* Did not find any server_rec that matches this MD *and* has an * s->addrs match for the https port. Suspicious. */ - ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, base_server, APLOGNO(10106) "MD %s is configured to require https, but there seems to be " "no VirtualHost for it that has port %d in its address list. " "This looks as if it will not work.", @@ -781,7 +781,7 @@ static apr_status_t run_watchdog(int state, void *baton, apr_pool_t *ptemp) now = apr_time_now(); if (APLOGdebug(wd->s)) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd->s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, wd->s, APLOGNO(10107) "next run in %s", md_print_duration(ptemp, next_run - now)); } wd_set_interval(wd->watchdog, next_run - now, wd, run_watchdog); @@ -824,12 +824,12 @@ static apr_status_t run_watchdog(int state, void *baton, apr_pool_t *ptemp) cmdline = apr_psprintf(ptemp, "%s %s", wd->mc->notify_cmd, names); apr_tokenize_to_argv(cmdline, (char***)&argv, ptemp); if (APR_SUCCESS == (rv = md_util_exec(ptemp, argv[0], argv, &exit_code))) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, wd->s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, wd->s, APLOGNO(10108) "notify command '%s' returned %d", wd->mc->notify_cmd, exit_code); } else { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, wd->s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, rv, wd->s, APLOGNO(10109) "executing configured MDNotifyCmd %s", wd->mc->notify_cmd); notified = 0; } @@ -1170,7 +1170,7 @@ static apr_status_t md_get_certificate(server_rec *s, apr_pool_t *p, md = md_reg_get(reg, sc->assigned->name, p); if (APR_SUCCESS != (rv = md_reg_get_cred_files(reg, md, p, pkeyfile, pcertfile))) { - ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO() + ap_log_error(APLOG_MARK, APLOG_ERR, rv, s, APLOGNO(10110) "retrieving credentials for MD %s", md->name); return rv; } |