Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249203
Change subject: Match filenames at any sample rate
......................................................................
Match filenames at any sample rate
We were previously hardcoding in the 1:100 sample rate when searching for
logfiles.
Note this also fixes a bad bug--but in an unused script,
LoadBannerImpressions.py.
Bug: T116800
Change-Id: I3d167e0358fbe765a5bd54c44d86f1db0e09dfad
---
M fundraiser/analytics/management/commands/LoadBannerImpressions.py
M fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
2 files changed, 5 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools/DjangoBannerStats
refs/changes/03/249203/1
diff --git a/fundraiser/analytics/management/commands/LoadBannerImpressions.py
b/fundraiser/analytics/management/commands/LoadBannerImpressions.py
index d646f73..dfc6026 100644
--- a/fundraiser/analytics/management/commands/LoadBannerImpressions.py
+++ b/fundraiser/analytics/management/commands/LoadBannerImpressions.py
@@ -84,8 +84,8 @@
time_now = datetime.now()
time_minus1hr = time_now - timedelta(hours=1)
- now = "beaconImpressions-sampled100.tsv-%s*" %
time_now.strftime("%Y%m%d-%H")
- pasthour = "bannerImpressions-sampled100.tsv-%s*" %
time_minus1hr.strftime("%Y%m%d-%H")
+ now = "beaconImpressions-sampled*.tsv-%s*" %
time_now.strftime("%Y%m%d-%H")
+ pasthour = "beaconImpressions-sampled*.tsv-%s*" %
time_minus1hr.strftime("%Y%m%d-%H")
files.extend(glob.glob(os.path.join(UDP_LOG_PATH,
time_now.strftime("%Y"), now)))
files.extend(glob.glob(os.path.join(UDP_LOG_PATH,
time_minus1hr.strftime("%Y"), pasthour)))
diff --git
a/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
b/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
index 92d2971..e86e267 100644
---
a/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
+++
b/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
@@ -14,6 +14,7 @@
import os
import urlparse
+# TODO: import NAME instead, so usage includes the full namespace.
from fundraiser.analytics.functions import *
from fundraiser.analytics.models import *
from fundraiser.analytics.regex import *
@@ -81,8 +82,8 @@
time_now = datetime.now()
time_minus1hr = time_now - timedelta(hours=1)
- now = "beaconImpressions-sampled100.tsv-%s*" %
time_now.strftime("%Y%m%d-%H")
- pasthour = "beaconImpressions-sampled100.tsv-%s*" %
time_minus1hr.strftime("%Y%m%d-%H")
+ now = "beaconImpressions-sampled*.tsv-%s*" %
time_now.strftime("%Y%m%d-%H")
+ pasthour = "beaconImpressions-sampled*.tsv-%s*" %
time_minus1hr.strftime("%Y%m%d-%H")
files.extend(glob.glob(os.path.join(UDP_LOG_PATH,
time_now.strftime("%Y"), now)))
files.extend(glob.glob(os.path.join(UDP_LOG_PATH,
time_minus1hr.strftime("%Y"), pasthour)))
--
To view, visit https://gerrit.wikimedia.org/r/249203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d167e0358fbe765a5bd54c44d86f1db0e09dfad
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools/DjangoBannerStats
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
