/*
- * DEBUG: section 46 Access Log - Squid format
- * AUTHOR: Duane Wessels
- *
- * SQUID Web Proxy Cache http://www.squid-cache.org/
- * ----------------------------------------------------------
- *
- * Squid is the result of efforts by numerous individuals from
- * the Internet community; see the CONTRIBUTORS file for full
- * details. Many organizations have provided support for Squid's
- * development; see the SPONSORS file for full details. Squid is
- * Copyrighted (C) 2001 by the Regents of the University of
- * California; see the COPYRIGHT file for full details. Squid
- * incorporates software developed and/or copyrighted by other
- * sources; see the CREDITS file for full details.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ * Copyright (C) 1996-2018 The Squid Software Foundation and contributors
*
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
*/
+/* DEBUG: section 46 Access Log - Squid format */
+
#include "squid.h"
#include "AccessLogEntry.h"
#include "format/Quoting.h"
#endif
if (!user)
- user = ::Format::QuoteUrlEncodeUsername(al->cache.extuser);
+ user = ::Format::QuoteUrlEncodeUsername(al->getExtUser());
-#if USE_SSL
+#if USE_OPENSSL
if (!user)
user = ::Format::QuoteUrlEncodeUsername(al->cache.ssluser);
#endif
if (!user)
- user = ::Format::QuoteUrlEncodeUsername(al->cache.rfc931);
+ user = ::Format::QuoteUrlEncodeUsername(al->getClientIdent());
if (user && !*user)
safe_free(user);
char clientip[MAX_IPSTRLEN];
al->getLogClientIp(clientip, MAX_IPSTRLEN);
- logfilePrintf(logfile, "%9ld.%03d %6d %s %s%s/%03d %" PRId64 " %s %s %s %s%s/%s %s%s",
+ const SBuf method(al->getLogMethod());
+
+ logfilePrintf(logfile, "%9ld.%03d %6ld %s %s/%03d %" PRId64 " " SQUIDSBUFPH " " SQUIDSBUFPH " %s %s%s/%s %s%s",
(long int) current_time.tv_sec,
(int) current_time.tv_usec / 1000,
- al->cache.msec,
+ tvToMsec(al->cache.trTime),
clientip,
- LogTags_str[al->cache.code],
- al->http.statusSfx(),
+ al->cache.code.c_str(),
al->http.code,
- al->cache.replySize,
- al->_private.method_str,
- al->url,
+ al->http.clientReplySz.messageTotal(),
+ SQUIDSBUFPRINT(method),
+ SQUIDSBUFPRINT(al->url),
user ? user : dash_str,
al->hier.ping.timedout ? "TIMEOUT_" : "",
hier_code_str[al->hier.code],
safe_free(erep);
}
}
+