Skip to content

C
converse.js
Commit c9399b67 authored by Michal Čihař's avatar Michal Čihař
Browse files
Options

Single place to define application logger

parent 6f0d1f1a
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 71 deletions
accounts/models.py
View file @ c9399b67
......@@ -41,10 +41,6 @@ from trans.models import Project, Change
from trans.util import get_user_display, get_site_url
import weblate
import logging
logger = logging.getLogger('weblate')
def send_notification_email(language, email, notification, translation_obj,
context=None, headers=None, from_email=None):
......@@ -57,7 +53,7 @@ def send_notification_email(language, email, notification, translation_obj,
if headers is None:
headers = {}
try:
logger.info(
weblate.logger.info(
'sending notification %s on %s to %s',
notification,
translation_obj.__unicode__(),
......
lang/models.py
View file @ c9399b67
......@@ -27,9 +27,7 @@ from lang import data
from south.signals import post_migrate
from django.db.models.signals import post_syncdb
from django.dispatch import receiver
import logging
logger = logging.getLogger('weblate')
import weblate
# Plural types definition
PLURAL_NONE = 0
......@@ -84,7 +82,7 @@ def get_plural_type(code, pluralequation):
return PLURAL_ARABIC
# Log error in case of uknown mapping
logger.error(
weblate.logger.error(
'Can not guess type of plural for %s: %s', code, pluralequation
)
......
trans/management/commands/import_project.py
View file @ c9399b67
......@@ -28,13 +28,11 @@ from glob import glob
from optparse import make_option
import tempfile
import git
import logging
import os
import re
import shutil
import fnmatch
logger = logging.getLogger('weblate')
import weblate
class Command(BaseCommand):
......@@ -70,15 +68,15 @@ class Command(BaseCommand):
os.chmod(workdir, 0755)
# Initialize git repository
logger.info('Initializing git repository...')
weblate.logger.info('Initializing git repository...')
gitrepo = git.Repo.init(workdir)
gitrepo.git.remote('add', 'origin', repo)
logger.info('Fetching remote git repository...')
weblate.logger.info('Fetching remote git repository...')
gitrepo.git.remote('update', 'origin')
gitrepo.git.branch('--track', branch, 'origin/%s' % branch)
logger.info('Updating working copy in git repository...')
weblate.logger.info('Updating working copy in git repository...')
gitrepo.git.checkout(branch)
return workdir
......@@ -96,14 +94,14 @@ class Command(BaseCommand):
'''
# Find matching files
matches = self.get_matching_files(repo, filemask)
logger.info('Found %d matching files', len(matches))
weblate.logger.info('Found %d matching files', len(matches))
# Parse subproject names out of them
names = set()
maskre = self.get_match_regexp(filemask)
for match in matches:
names.add(self.get_name(maskre, match))
logger.info('Found %d subprojects', len(names))
weblate.logger.info('Found %d subprojects', len(names))
return names
def handle(self, *args, **options):
......@@ -163,10 +161,10 @@ class Command(BaseCommand):
project=project
)
if subprojects.exists():
logger.warn('Subproject %s already exists, skipping', name)
weblate.logger.warn('Subproject %s already exists, skipping', name)
continue
logger.info('Creating subproject %s', name)
weblate.logger.info('Creating subproject %s', name)
SubProject.objects.create(
name=name,
slug=slug,
......@@ -190,12 +188,12 @@ class Command(BaseCommand):
slug = slugify(name)
if SubProject.objects.filter(project=project, slug=slug).exists():
logger.warn('Subproject %s already exists, skipping and using it '
weblate.logger.warn('Subproject %s already exists, skipping and using it '
'as main subproject', name)
shutil.rmtree(workdir)
return matches, 'weblate://%s/%s' % (project.slug, slug)
logger.info('Creating subproject %s as main subproject', name)
weblate.logger.info('Creating subproject %s as main subproject', name)
# Rename gitrepository to new name
os.rename(
......
trans/models/subproject.py
View file @ c9399b67
......@@ -28,7 +28,7 @@ from django.core.urlresolvers import reverse
from glob import glob
import os
import os.path
import logging
import weblate
import git
from trans.formats import FILE_FORMAT_CHOICES, FILE_FORMATS
from trans.models.project import Project
......@@ -38,8 +38,6 @@ from trans.util import get_site_url
from trans.util import sleep_while_git_locked
from trans.validators import validate_repoweb, validate_filemask, validate_repo
logger = logging.getLogger('weblate')
class SubProjectManager(models.Manager):
def all_acl(self, user):
......@@ -340,7 +338,7 @@ class SubProject(models.Model):
return self.linked_subproject.update_remote_branch(validate)
# Update
logger.info('updating repo %s', self.__unicode__())
weblate.logger.info('updating repo %s', self.__unicode__())
try:
try:
self.git_repo.git.remote('update', 'origin')
......@@ -350,7 +348,7 @@ class SubProject(models.Model):
sleep_while_git_locked()
self.git_repo.git.remote('update', 'origin')
except Exception as e:
logger.error('Failed to update Git repo: %s', str(e))
weblate.logger.error('Failed to update Git repo: %s', str(e))
if validate:
raise ValidationError(
_('Failed to fetch git repository: %s') % str(e)
......@@ -462,14 +460,14 @@ class SubProject(models.Model):
# Do actual push
try:
logger.info('pushing to remote repo %s', self.__unicode__())
weblate.logger.info('pushing to remote repo %s', self.__unicode__())
self.git_repo.git.push(
'origin',
'%s:%s' % (self.branch, self.branch)
)
return True
except Exception as e:
logger.warning('failed push on repo %s', self.__unicode__())
weblate.logger.warning('failed push on repo %s', self.__unicode__())
msg = 'Error:\n%s' % str(e)
mail_admins(
'failed push on repo %s' % self.__unicode__(),
......@@ -496,10 +494,10 @@ class SubProject(models.Model):
# Do actual reset
with self.git_lock:
try:
logger.info('reseting to remote repo %s', self.__unicode__())
weblate.logger.info('reseting to remote repo %s', self.__unicode__())
self.git_repo.git.reset('--hard', 'origin/%s' % self.branch)
except Exception as e:
logger.warning('failed reset on repo %s', self.__unicode__())
weblate.logger.warning('failed reset on repo %s', self.__unicode__())
msg = 'Error:\n%s' % str(e)
mail_admins(
'failed reset on repo %s' % self.__unicode__(),
......@@ -586,7 +584,7 @@ class SubProject(models.Model):
try:
# Try to merge it
method('origin/%s' % self.branch)
logger.info(
weblate.logger.info(
'%s remote into repo %s',
self.project.merge_style,
self.__unicode__()
......@@ -599,7 +597,7 @@ class SubProject(models.Model):
method('--abort')
# Log error
logger.warning(
weblate.logger.warning(
'failed %s on repo %s',
self.project.merge_style,
self.__unicode__()
......@@ -634,10 +632,10 @@ class SubProject(models.Model):
for path in self.get_mask_matches():
code = self.get_lang_code(path)
if langs is not None and code not in langs:
logger.info('skipping %s', path)
weblate.logger.info('skipping %s', path)
continue
logger.info('checking %s', path)
weblate.logger.info('checking %s', path)
translation = Translation.objects.update_from_blob(
self, code, path, force, request=request
)
......@@ -647,7 +645,7 @@ class SubProject(models.Model):
if langs is None:
todelete = self.translation_set.exclude(id__in=translations)
if todelete.exists():
logger.info(
weblate.logger.info(
'removing stale translations: %s',
','.join([trans.language.code for trans in todelete])
)
......@@ -655,13 +653,13 @@ class SubProject(models.Model):
# Process linked repos
for subproject in self.get_linked_childs():
logger.info(
weblate.logger.info(
'updating linked project %s',
subproject
)
subproject.create_translations(force, langs, request=request)
logger.info('updating of %s completed', self)
weblate.logger.info('updating of %s completed', self)
def get_lang_code(self, path):
'''
......
trans/models/translation.py
View file @ c9399b67
......@@ -29,7 +29,6 @@ from django.core.cache import cache
from django.utils import timezone
from django.core.urlresolvers import reverse
import os.path
import logging
import git
from translate.storage import poheader
from datetime import datetime, timedelta
......@@ -42,8 +41,6 @@ from trans.models.subproject import SubProject
from trans.models.project import Project
from trans.util import get_user_display, get_site_url, sleep_while_git_locked
logger = logging.getLogger('weblate')
class TranslationManager(models.Manager):
def update_from_blob(self, subproject, code, path, force=False,
......@@ -418,13 +415,13 @@ class Translation(models.Model):
# Check if we're not already up to date
if self.revision != blob_hash:
logger.info(
weblate.logger.info(
'processing %s in %s, revision has changed',
self.filename,
self.subproject.__unicode__()
)
elif force:
logger.info(
weblate.logger.info(
'processing %s in %s, check forced',
self.filename,
self.subproject.__unicode__()
......@@ -745,7 +742,7 @@ class Translation(models.Model):
# Can we delay commit?
if not force_commit and appsettings.LAZY_COMMITS:
logger.info(
weblate.logger.info(
'Delaying commiting %s in %s as %s',
self.filename,
self,
......@@ -754,7 +751,7 @@ class Translation(models.Model):
return False
# Do actual commit with git lock
logger.info('Commiting %s in %s as %s', self.filename, self, author)
weblate.logger.info('Commiting %s in %s as %s', self.filename, self, author)
with self.subproject.git_lock:
try:
self.__git_commit(gitrepo, author, timestamp, sync)
......
trans/models/unit.py
View file @ c9399b67
......@@ -27,7 +27,6 @@ from django.contrib import messages
from django.core.cache import cache
from whoosh import qparser
import itertools
import logging
import traceback
from trans.checks import CHECKS
from trans.models.translation import Translation
......@@ -36,8 +35,7 @@ from trans.data import IGNORE_SIMILAR
from trans.filelock import FileLockException
from trans.util import is_plural, split_plural
logger = logging.getLogger('weblate')
import weblate
class UnitManager(models.Manager):
......@@ -519,7 +517,7 @@ class Unit(models.Model):
try:
(saved, pounit) = self.translation.update_unit(self, request)
except FileLockException:
logger.error('failed to lock backend for %s!', self)
weblate.logger.error('failed to lock backend for %s!', self)
messages.error(
request,
_(
......@@ -531,7 +529,7 @@ class Unit(models.Model):
# Handle situation when backend did not find the message
if pounit is None:
logger.error('message %s disappeared!', self)
weblate.logger.error('message %s disappeared!', self)
messages.error(
request,
_(
......@@ -635,7 +633,7 @@ class Unit(models.Model):
'''
# Warn if request is not coming from backend
if not 'backend' in kwargs:
logger.error(
weblate.logger.error(
'Unit.save called without backend sync: %s',
''.join(traceback.format_stack())
)
......
trans/views/api.py
View file @ c9399b67
......@@ -29,11 +29,9 @@ from trans.views.helper import get_project, get_subproject
from trans.util import get_site_url
import json
import logging
import weblate
import threading
logger = logging.getLogger('weblate')
BITBUCKET_REPOS = (
'git@bitbucket.org:%(owner)s/%(slug)s.git',
......@@ -115,7 +113,7 @@ def git_service_hook(request, service):
elif service == 'bitbucket':
hook_helper = bitbucket_hook_helper
else:
logger.error('service %s, not supported', service)
weblate.logger.error('service %s, not supported', service)
return HttpResponseBadRequest('invalid service')
# Send the request data to the service handler.
......@@ -128,14 +126,14 @@ def git_service_hook(request, service):
service_long_name = service_data['service_long_name']
repos = service_data['repos']
branch = service_data['branch']
logger.info(
weblate.logger.info(
'received %s notification on repository %s, branch %s',
service_long_name, repos[0], branch
)
# Trigger updates
for obj in SubProject.objects.filter(repo__in=repos, branch=branch):
logger.info(
weblate.logger.info(
'%s notification will update %s',
service_long_name,
obj
......
trans/views/edit.py
View file @ c9399b67
......@@ -38,10 +38,7 @@ from trans.views.helper import (
)
from trans.util import join_plural
from accounts.models import Profile, send_notification_email
import logging
logger = logging.getLogger('weblate')
import weblate
def translate(request, project, subproject, lang):
......@@ -203,7 +200,7 @@ def translate(request, project, subproject, lang):
search_options.url
))
except Unit.DoesNotExist:
logger.error(
weblate.logger.error(
'message %s disappeared!',
form.cleaned_data['checksum']
)
......@@ -263,7 +260,7 @@ def translate(request, project, subproject, lang):
search_options.url
))
except Unit.DoesNotExist:
logger.error(
weblate.logger.error(
'message %s disappeared!',
form.cleaned_data['checksum']
)
......
trans/views/files.py
View file @ c9399b67
......@@ -26,10 +26,6 @@ from django.contrib.auth.decorators import login_required, permission_required
from trans.forms import UploadForm, SimpleUploadForm, ExtraUploadForm
from trans.views.helper import get_translation
import logging
logger = logging.getLogger('weblate')
def download_translation(request, project, subproject, lang):
obj = get_translation(request, project, subproject, lang)
......
trans/views/js.py
View file @ c9399b67
......@@ -32,15 +32,13 @@ from trans.decorators import any_permission_required
from trans.views.helper import (
get_project, get_subproject, get_translation
)
import weblate
from whoosh.analysis import StandardAnalyzer, StemmingAnalyzer
import logging
import json
from xml.etree import ElementTree
import urllib2
logger = logging.getLogger('weblate')
def get_string(request, checksum):
'''
......@@ -205,7 +203,7 @@ def js_config(request):
parsed = json.loads(pairs)
apertium_langs = [p['targetLanguage'] for p in parsed['responseData'] if p['sourceLanguage'] == 'en']
except Exception as e:
logger.error('failed to get supported languages from Apertium, using defaults (%s)', str(e))
weblate.logger.error('failed to get supported languages from Apertium, using defaults (%s)', str(e))
apertium_langs = ['gl', 'ca', 'es', 'eo']
else:
apertium_langs = None
......@@ -218,7 +216,7 @@ def js_config(request):
parsed = ElementTree.fromstring(data)
microsoft_langs = [p.text for p in parsed.getchildren()]
except Exception as e:
logger.error('failed to get supported languages from Microsoft, using defaults (%s)', str(e))
weblate.logger.error('failed to get supported languages from Microsoft, using defaults (%s)', str(e))
microsoft_langs = [
'ar', 'bg', 'ca', 'zh-CHS', 'zh-CHT', 'cs', 'da', 'nl', 'en',
'et', 'fi', 'fr', 'de', 'el', 'ht', 'he', 'hi', 'mww', 'hu',
......
weblate/__init__.py
View file @ c9399b67
......@@ -19,6 +19,9 @@
#
import os
import logging
logger = logging.getLogger('weblate')
def get_root_dir():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7