Milimetric has submitted this change and it was merged.
Change subject: cleaning up logging a bit
......................................................................
cleaning up logging a bit
Change-Id: I58cf1beb9545505cb6da91be37901e9ed642c3d1
---
M tests/test_controllers/test_demo.py
M tests/test_controllers/test_reports.py
M tests/test_models/test_report_response.py
M wikimetrics/configurables.py
M wikimetrics/controllers/cohorts.py
M wikimetrics/controllers/demo.py
M wikimetrics/controllers/reports.py
M wikimetrics/metrics/dummy.py
M wikimetrics/metrics/metric.py
M wikimetrics/metrics/namespace_edits.py
M wikimetrics/models/multi_project_metric_report.py
11 files changed, 11 insertions(+), 76 deletions(-)
Approvals:
Milimetric: Verified; Looks good to me, approved
diff --git a/tests/test_controllers/test_demo.py
b/tests/test_controllers/test_demo.py
index df8d7e4..8374702 100644
--- a/tests/test_controllers/test_demo.py
+++ b/tests/test_controllers/test_demo.py
@@ -1,9 +1,6 @@
from nose.tools import assert_equal
from tests.fixtures import WebTest
import json
-import logging
-
-logger = logging.getLogger(__name__)
class TestDemoController(WebTest):
diff --git a/tests/test_controllers/test_reports.py
b/tests/test_controllers/test_reports.py
index 55e5c24..3c20afa 100644
--- a/tests/test_controllers/test_reports.py
+++ b/tests/test_controllers/test_reports.py
@@ -2,9 +2,6 @@
from tests.fixtures import WebTest
import json
import celery
-import logging
-
-logger = logging.getLogger(__name__)
class TestReportsController(WebTest):
@@ -45,38 +42,3 @@
'/reports/list should return a list of report objects,'
'but instead returned:\n{0}'.format(response.data)
)
-
- @nottest
- def test_create(self):
- post_data = []
- #post_data = {
- #"name":"Bytes Added - Algeria Summer Teahouse",
- #"cohort":{
- #"description":"",
- #"id":1,
- #"name":"Algeria Summer Teahouse",
- #"selected":True
- #},
- #"metric":{
- #"description":"Compute different aggregations of the bytes"\
- # " contributed or removed from a mediawiki project",
- #"label":"Bytes Added",
- #"name":"BytesAdded",
- #"id":"bytes-added",
- #"tabId":"metric-bytes-added",
- #"tabIdSelector":"#metric-bytes-added",
- #"selected":True,
-
#"csrf_token":"20130709113638##91658fda06626f46b1f3bacf25e2038d824aef0e",
- #"start_date":"2012/1/1",
- #"end_date":"2013/1/1",
- #"namespaces":"0",
- #"positive_only_sum":True,
- #"negative_only_sum":True,
- #"absolute_sum":True,
- #"net_sum":True},
- #"tabId":"response-to-bytes-added-for-1",
- #"tabIdSelector":"#response-to-bytes-added-for-1"
- #}
-
- response = self.app.post('/reports/create/', data=post_data)
- logger.debug(response)
diff --git a/tests/test_models/test_report_response.py
b/tests/test_models/test_report_response.py
index 356cceb..539c987 100644
--- a/tests/test_models/test_report_response.py
+++ b/tests/test_models/test_report_response.py
@@ -2,9 +2,6 @@
from wikimetrics.metrics import NamespaceEdits
from ..fixtures import QueueDatabaseTest
from nose.tools import assert_equals
-import logging
-
-logger = logging.getLogger(__name__)
class RunReportTest(QueueDatabaseTest):
diff --git a/wikimetrics/configurables.py b/wikimetrics/configurables.py
index fc169e2..ee87b42 100644
--- a/wikimetrics/configurables.py
+++ b/wikimetrics/configurables.py
@@ -3,9 +3,7 @@
import sys
import imp
import os
-import logging
import yaml
-logger = logging.getLogger(__name__)
# TODO: does not work in labs environment
@@ -81,7 +79,6 @@
def config_celery(args):
- logger.info('about to import celery')
from celery import Celery
# create and configure celery app
diff --git a/wikimetrics/controllers/cohorts.py
b/wikimetrics/controllers/cohorts.py
index d799b4f..c280ed3 100644
--- a/wikimetrics/controllers/cohorts.py
+++ b/wikimetrics/controllers/cohorts.py
@@ -10,9 +10,6 @@
Cohort, CohortUser, CohortUserRole,
User, WikiUser, CohortWikiUser, MediawikiUser
)
-import logging
-
-logger = logging.getLogger(__name__)
@app.route('/cohorts/')
@@ -400,12 +397,14 @@
# make a link to the potential user page even if user doesn't exist
# this gives a chance to see any misspelling etc.
if normalized_user is None:
- app.logger.info('invalid user: %s', record['user_str'])
+ app.logger.info(
+ 'invalid user: {0} in project {1}'
+ .format(record['user_str'], normalized_project)
+ )
record['reason_invalid'] = 'invalid user_name / user_id: %s' %
record['user_str']
invalid.append(record)
continue
# set the normalized values and append to valid
- app.logger.info('found a valid user_str: %s', record['user_str'])
record['project'] = normalized_project
record['user_id'], record['username'] = normalized_user
valid.append(record)
diff --git a/wikimetrics/controllers/demo.py b/wikimetrics/controllers/demo.py
index ca31ad9..2d524b7 100644
--- a/wikimetrics/controllers/demo.py
+++ b/wikimetrics/controllers/demo.py
@@ -14,8 +14,6 @@
from ..models.mediawiki import Revision, Page
from datetime import datetime
from ..metrics import RandomMetric
-import logging
-logger = logging.getLogger(__name__)
if app.config['DEBUG']:
diff --git a/wikimetrics/controllers/reports.py
b/wikimetrics/controllers/reports.py
index 0eb93cc..0dff11d 100644
--- a/wikimetrics/controllers/reports.py
+++ b/wikimetrics/controllers/reports.py
@@ -55,11 +55,6 @@
metric = metric_class(**metric_dict)
metric.validate()
- # debug output
- #app.logger.debug('cohort_metric_dict: %s', cohort_metric_dict)
- #app.logger.debug('cohort: %s', cohort)
- #app.logger.debug('metric: %s', metric)
-
# construct and start RunReport
metric_report = MultiProjectMetricReport(
cohort,
@@ -76,7 +71,7 @@
jr = RunReport(metric_reports, name=name)
async_response = jr.task.delay()
app.logger.info(
- 'starting report with celery_id: %s, PersistentReport.id: %d',
+ 'starting report with database id: %s, PersistentReport.id: %d',
async_response.task_id, jr.persistent_id
)
@@ -144,7 +139,6 @@
task_rows.append(row)
writer.writeheader()
writer.writerows(task_rows)
- app.logger.debug('celery task is ready! returning actual result:\n%s',
csv_io.getvalue())
response = Response(csv_io.getvalue(), mimetype='text/csv')
else:
response = json_response(status=celery_task.status)
diff --git a/wikimetrics/metrics/dummy.py b/wikimetrics/metrics/dummy.py
index 4fb6384..ecc30d5 100644
--- a/wikimetrics/metrics/dummy.py
+++ b/wikimetrics/metrics/dummy.py
@@ -1,11 +1,9 @@
import random
from wtforms import IntegerField
from metric import Metric
-import logging
+
__all__ = ['RandomMetric']
-
-logger = logging.getLogger(__name__)
class RandomMetric(Metric):
diff --git a/wikimetrics/metrics/metric.py b/wikimetrics/metrics/metric.py
index 1590d8d..cbe5c4d 100644
--- a/wikimetrics/metrics/metric.py
+++ b/wikimetrics/metrics/metric.py
@@ -1,11 +1,8 @@
from wtforms.ext.csrf.session import SessionSecureForm
from wikimetrics.configurables import app
-import logging
-logger = logging.getLogger(__name__)
-__all__ = [
- 'Metric',
-]
+
+__all__ = ['Metric']
class Metric(SessionSecureForm):
diff --git a/wikimetrics/metrics/namespace_edits.py
b/wikimetrics/metrics/namespace_edits.py
index 9eed69d..7813337 100644
--- a/wikimetrics/metrics/namespace_edits.py
+++ b/wikimetrics/metrics/namespace_edits.py
@@ -3,8 +3,7 @@
from form_fields import CommaSeparatedIntegerListField
from wtforms.validators import Required
from wikimetrics.models import Page, Revision
-import logging
-logger = logging.getLogger(__name__)
+
__all__ = [
'NamespaceEdits',
@@ -51,7 +50,6 @@
dictionary from user ids to the number of edit found.
"""
# directly construct dict from query results
- logger.debug('user_ids: %s, namespaces: %s', user_ids, self.namespaces)
revisions_by_user = dict(
session
.query(Revision.rev_user, func.count(Revision.rev_id))
diff --git a/wikimetrics/models/multi_project_metric_report.py
b/wikimetrics/models/multi_project_metric_report.py
index d0e2399..2a03a0e 100644
--- a/wikimetrics/models/multi_project_metric_report.py
+++ b/wikimetrics/models/multi_project_metric_report.py
@@ -1,13 +1,11 @@
from wikimetrics.configurables import queue
from celery.utils.log import get_task_logger
-import logging
import report
import json
from metric_report import MetricReport
-__all__ = [
- 'MultiProjectMetricReport',
-]
+
+__all__ = ['MultiProjectMetricReport']
task_logger = get_task_logger(__name__)
--
To view, visit https://gerrit.wikimedia.org/r/75861
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58cf1beb9545505cb6da91be37901e9ed642c3d1
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Milimetric <[email protected]>
Gerrit-Reviewer: Milimetric <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
