X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fadaptation%2Ficap%2FXaction.cc;h=e7f4cc0749816d13a2e7bce7703191aee37c730f;hb=e13816381e77a355099d4673cbe38e11f0fdfec2;hp=8fa22629ee96be58599d7b2a0bffcc95b7277897;hpb=1d17c89ac8d0479e43abd0536aeb7f2644e6930d;p=thirdparty%2Fsquid.git diff --git a/src/adaptation/icap/Xaction.cc b/src/adaptation/icap/Xaction.cc index 8fa22629ee..e7f4cc0749 100644 --- a/src/adaptation/icap/Xaction.cc +++ b/src/adaptation/icap/Xaction.cc @@ -432,7 +432,7 @@ void Adaptation::Icap::Xaction::setOutcome(const Adaptation::Icap::XactOutcome & { if (al.icap.outcome != xoUnknown) { debugs(93, 3, HERE << "Warning: reseting outcome: from " << - al.icap.outcome << " to " << xo); + al.icap.outcome << " to " << xo); } else { debugs(93, 4, HERE << xo); } @@ -462,19 +462,20 @@ void Adaptation::Icap::Xaction::swanSong() Adaptation::Initiate::swanSong(); } -void Adaptation::Icap::Xaction::tellQueryAborted() { +void Adaptation::Icap::Xaction::tellQueryAborted() +{ Adaptation::Icap::Launcher *l = dynamic_cast(theInitiator.ptr()); Adaptation::Icap::XactAbortInfo abortInfo(icapRequest, icapReply, retriable(), repeatable()); - CallJob(91, 5, __FILE__, __LINE__, + CallJob(91, 5, __FILE__, __LINE__, "Adaptation::Icap::Launcher::noteXactAbort", XactAbortCall(l, &Adaptation::Icap::Launcher::noteXactAbort, abortInfo) ); clearInitiator(); } -void Adaptation::Icap::Xaction::maybeLog() { - if(IcapLogfileStatus == LOG_ENABLE) - { +void Adaptation::Icap::Xaction::maybeLog() +{ + if (IcapLogfileStatus == LOG_ENABLE) { ACLChecklist *checklist = new ACLFilledChecklist(::Config.accessList.icap, al.request, dash_str); if (!::Config.accessList.icap || checklist->fastCheck()) { finalizeLogInfo(); @@ -489,12 +490,12 @@ void Adaptation::Icap::Xaction::finalizeLogInfo() { //prepare log data al.icp.opcode = ICP_INVALID; - + const Adaptation::Icap::ServiceRep &s = service(); al.icap.hostAddr = s.cfg().host.termedBuf(); al.icap.serviceName = s.cfg().key; al.icap.reqUri = s.cfg().uri; - + al.icap.ioTime = tvSubMsec(icap_tio_start, icap_tio_finish); al.icap.trTime = tvSubMsec(icap_tr_start, current_time);