Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/347131 )
Change subject: Use correct UDP_LOG_PATH
......................................................................
Use correct UDP_LOG_PATH
From django.conf.settings, not default fundraiser.settings
Change-Id: I6b9e1b1f74a78a985724cd2dee0cf853d8c796ea
---
M fundraiser/analytics/management/commands/AggregateBannerImpressions.py
M fundraiser/analytics/management/commands/LoadBannerImpressions.py
M fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
M fundraiser/analytics/management/commands/LoadLPImpressions.py
4 files changed, 10 insertions(+), 11 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools/DjangoBannerStats
refs/changes/31/347131/1
diff --git
a/fundraiser/analytics/management/commands/AggregateBannerImpressions.py
b/fundraiser/analytics/management/commands/AggregateBannerImpressions.py
index 2b7a010..8edb4a6 100644
--- a/fundraiser/analytics/management/commands/AggregateBannerImpressions.py
+++ b/fundraiser/analytics/management/commands/AggregateBannerImpressions.py
@@ -10,7 +10,6 @@
from fundraiser.analytics.functions import *
from fundraiser.analytics.models import *
from fundraiser.analytics.regex import *
-from fundraiser.settings import UDP_LOG_PATH
class Command(BaseCommand):
@@ -147,4 +146,4 @@
except Exception as e:
transaction.rollback('default')
- raise e
\ No newline at end of file
+ raise e
diff --git a/fundraiser/analytics/management/commands/LoadBannerImpressions.py
b/fundraiser/analytics/management/commands/LoadBannerImpressions.py
index 0e748e9..fa92580 100644
--- a/fundraiser/analytics/management/commands/LoadBannerImpressions.py
+++ b/fundraiser/analytics/management/commands/LoadBannerImpressions.py
@@ -16,7 +16,7 @@
from fundraiser.analytics.functions import *
from fundraiser.analytics.models import *
from fundraiser.analytics.regex import *
-from fundraiser.settings import UDP_LOG_PATH
+from django.conf import settings
class Command(BaseCommand):
@@ -87,8 +87,8 @@
now = "beaconImpressions-sampled*.tsv-%s*" %
time_now.strftime("%Y%m%d-%H")
pasthour = "beaconImpressions-sampled*.tsv-%s*" %
time_minus1hr.strftime("%Y%m%d-%H")
- now_glob = os.path.join(UDP_LOG_PATH, time_now.strftime("%Y"),
now)
- pasthour_glob = os.path.join(UDP_LOG_PATH,
time_minus1hr.strftime("%Y"), pasthour)
+ now_glob = os.path.join(settings.UDP_LOG_PATH,
time_now.strftime("%Y"), now)
+ pasthour_glob = os.path.join(settings.UDP_LOG_PATH,
time_minus1hr.strftime("%Y"), pasthour)
self.logger.info("Checking for files matching '{now}' or
'{pasthour}'".format(now=now_glob, pasthour=pasthour_glob))
diff --git
a/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
b/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
index e86e267..ee83ede 100644
---
a/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
+++
b/fundraiser/analytics/management/commands/LoadBannerImpressions2Aggregate.py
@@ -18,7 +18,7 @@
from fundraiser.analytics.functions import *
from fundraiser.analytics.models import *
from fundraiser.analytics.regex import *
-from fundraiser.settings import UDP_LOG_PATH
+from django.conf import settings
class Command(BaseCommand):
@@ -85,8 +85,8 @@
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)))
+ files.extend(glob.glob(os.path.join(settings.UDP_LOG_PATH,
time_now.strftime("%Y"), now)))
+ files.extend(glob.glob(os.path.join(settings.UDP_LOG_PATH,
time_minus1hr.strftime("%Y"), pasthour)))
else:
if os.path.isdir(filename):
self.logger.info("Processing directory")
diff --git a/fundraiser/analytics/management/commands/LoadLPImpressions.py
b/fundraiser/analytics/management/commands/LoadLPImpressions.py
index 43eca31..3ee30d6 100644
--- a/fundraiser/analytics/management/commands/LoadLPImpressions.py
+++ b/fundraiser/analytics/management/commands/LoadLPImpressions.py
@@ -17,7 +17,7 @@
from fundraiser.analytics.functions import *
from fundraiser.analytics.models import *
from fundraiser.analytics.regex import *
-from fundraiser.settings import UDP_LOG_PATH
+from django.conf import settings
class Command(BaseCommand):
@@ -94,8 +94,8 @@
now = "landingpages.tsv-%s*" % time_now.strftime("%Y%m%d-%H")
pasthour = "landingpages.tsv-%s*" %
time_minus1hr.strftime("%Y%m%d-%H")
- now_glob = os.path.join(UDP_LOG_PATH, time_now.strftime("%Y"),
now)
- pasthour_glob = os.path.join(UDP_LOG_PATH,
time_minus1hr.strftime("%Y"), pasthour)
+ now_glob = os.path.join(settings.UDP_LOG_PATH,
time_now.strftime("%Y"), now)
+ pasthour_glob = os.path.join(settings.UDP_LOG_PATH,
time_minus1hr.strftime("%Y"), pasthour)
self.logger.info("Checking for files matching '{now}' or
'{pasthour}'".format(now=now_glob, pasthour=pasthour_glob))
--
To view, visit https://gerrit.wikimedia.org/r/347131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b9e1b1f74a78a985724cd2dee0cf853d8c796ea
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/tools/DjangoBannerStats
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
