Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 74996189CA for ; Thu, 21 Jan 2016 20:33:32 +0000 (UTC) Received: (qmail 96679 invoked by uid 500); 21 Jan 2016 20:33:32 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 96618 invoked by uid 500); 21 Jan 2016 20:33:32 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 96609 invoked by uid 99); 21 Jan 2016 20:33:32 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Jan 2016 20:33:32 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id AF119C0860 for ; Thu, 21 Jan 2016 20:33:31 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id AFVMBLJiATBG for ; Thu, 21 Jan 2016 20:33:31 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id F22C220656 for ; Thu, 21 Jan 2016 20:33:30 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 89E7CE0924 for ; Thu, 21 Jan 2016 20:33:30 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 8AC2C3A008E for ; Thu, 21 Jan 2016 20:33:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1726092 - /httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Date: Thu, 21 Jan 2016 20:33:30 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160121203330.8AC2C3A008E@svn01-us-west.apache.org> Author: jim Date: Thu Jan 21 20:33:30 2016 New Revision: 1726092 URL: http://svn.apache.org/viewvc?rev=1726092&view=rev Log: log when we are updating hc worker, which should be never at present. Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1726092&r1=1726091&r2=1726092&view=diff ============================================================================== --- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original) +++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Thu Jan 21 20:33:30 2016 @@ -364,16 +364,16 @@ static proxy_worker *hc_get_hcworker(sct { proxy_worker *hc = NULL; const char* wptr; + apr_port_t port; wptr = apr_psprintf(ctx->p, "%pp", worker); hc = (proxy_worker *)apr_hash_get(ctx->hcworkers, wptr, APR_HASH_KEY_STRING); + port = (worker->s->port ? worker->s->port : ap_proxy_port_of_scheme(worker->s->scheme)); if (!hc) { apr_uri_t uri; apr_status_t rv; const char *url = worker->s->name; - apr_port_t port; wctx_t *wctx = apr_pcalloc(ctx->p, sizeof(wctx_t)); - port = (worker->s->port ? worker->s->port : ap_proxy_port_of_scheme(worker->s->scheme)); ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s, APLOGNO(03248) "Creating hc worker %s for %s://%s:%d", @@ -406,6 +406,10 @@ static proxy_worker *hc_get_hcworker(sct /* This *could* have changed via the Balancer Manager */ /* TODO */ if (hc->s->method != worker->s->method) { + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, ctx->s, APLOGNO() + "Updating hc worker %s for %s://%s:%d", + wptr, worker->s->scheme, worker->s->hostname, + (int)port); hc->s->method = worker->s->method; apr_hash_set(ctx->hcworkers, wptr, APR_HASH_KEY_STRING, hc); }