diff --git a/setup.py b/setup.py index c9418fe..629f608 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ ''' setup.py - setuptools installation configuration for warcprox -Copyright (C) 2013-2020 Internet Archive +Copyright (C) 2013-2021 Internet Archive This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/warcprox/crawl_log.py b/warcprox/crawl_log.py index 4e67723..73d6457 100644 --- a/warcprox/crawl_log.py +++ b/warcprox/crawl_log.py @@ -64,12 +64,17 @@ class CrawlLogger(object): else: content_length = 0 payload_digest = '-' + logging.info('metadata %s', recorded_url.warcprox_meta) + hop_path = recorded_url.warcprox_meta["hop_path"] if "hop_path" in recorded_url.warcprox_meta and recorded_url.warcprox_meta["hop_path"] and len(recorded_url.warcprox_meta["hop_path"].strip()) > 0 else '-' + hop_path_parent = recorded_url.warcprox_meta["hop_path_parent"] if "hop_path_parent" in recorded_url.warcprox_meta else None + if hop_path_parent and hop_path_parent != recorded_url.url: + hop_path = str(hop_path if hop_path and hop_path != "-" else "") + "B" fields = [ '{:%Y-%m-%dT%H:%M:%S}.{:03d}Z'.format(now, now.microsecond//1000), '% 5s' % status, '% 10s' % content_length, recorded_url.url, - '-', # hop path + hop_path, recorded_url.referer or '-', recorded_url.mimetype if recorded_url.mimetype is not None and recorded_url.mimetype.strip() else '-', '-',