Skip to content

Commit

Permalink
Merge pull request #18 from akamai/SortedOutputFix
Browse files Browse the repository at this point in the history
Fix the regression caused by SortedPageOutput introduced in 0.4.6
  • Loading branch information
bitonio authored Sep 5, 2024
2 parents 3adfe23 + c5b5491 commit 67c33fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions bin/akamai-etp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ from requests.compat import urljoin
from akamai.edgegrid import EdgeGridAuth, EdgeRc
from config import EdgeGridConfig

__version__ = "0.4.7"
__version__ = "0.4.8"

#: Window span in ad-hoc mode, default is 3 min
span_duration_min = 3
Expand Down Expand Up @@ -410,14 +410,14 @@ def fetch_events_concurrent(config, output: io.TextIOWrapper):
if config.end:
end = config.end

output_pages = SortedPageOutput(output)
pool_futures = []
concurrent_fetch = ThreadPoolExecutor(
max_workers=min(config.concurrent, MAX_FETCH_CONCURRENCY),
thread_name_prefix="ApiFetch")

while not stop_event.is_set():
timing_s = time.time()
output_pages = SortedPageOutput(output)
expected_event_count = events_summary(start, end, config)
# 1st page fetch is executed in the main cli thread, optional subsequent
# ones are executed within the thread pool
Expand Down
2 changes: 1 addition & 1 deletion cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"commands": [
{
"name": "etp",
"version": "0.4.7",
"version": "0.4.8",
"description": "Akamai CLI for Secure Internet Access Enterprise (f.k.a. Enterprise Threat Protector)"
}
]
Expand Down

0 comments on commit 67c33fb

Please sign in to comment.