May 2014 - tor-commits - lists.torproject.org

[bridgedb/develop] Update translations: Welsh (cy), Italian (it), Slovak (sk).
by isis＠torproject.org 01 May '14

01 May '14

commit 6ba28bb31275a10b3efa97919c864fa17470cc6f Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Apr 24 15:03:46 2014 +0000 Update translations: Welsh (cy), Italian (it), Slovak (sk). * UPDATE Italian (it) gettext file. Thanks to Francesca Ciceri. * ADD Welsh (cy) translations. Thanks to huwwaters and littlegreykida. * ADD Slovak (sk) translations. Thanks to Michelozzo and Svistwarrior273. --- lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++++++ lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 14 ++-- lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 102 ++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 6 deletions(-) diff --git a/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..b209bf3 --- /dev/null +++ b/lib/bridgedb/i18n/cy/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# huwwaters <huwwaters(a)gmail.com>, 2014 +# littlegreykida <theinfinitygap(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2014-03-26 08:20+0000\n" +"Last-Translator: littlegreykida <theinfinitygap(a)gmail.com>\n" +"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: cy\n" +"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Beth yw pontydd?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s Pontydd gyfnewid %s yw'r gyfnewidiau Tor sy'n helpu chithau i osgoi sensoriaeth." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Rwyf yn angen ffordd arall i cael gafael ar pontydd!" + +#: lib/bridgedb/templates/base.html:40 +#, python-format +msgid "" +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Ffordd arall i canfod cyfeiriadau pontydd cyhoeddys yw i anfon e-bost (o %s neu gyfeiriad %s) i %s gyda'r llinell 'get bridges' ar ei ben ei hyn o fewn corff yr e-bost." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Nid yw fy mhontydd yn gweithio! Rwyf yn angen help!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +msgid "" +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "Os nad yw'ch Tor yn gweithio, dylech e-bostio %s. Ceisiwch cynnwys cymaint o gwybodaith ag y bo modd, yn cynnwys yr rhestr o pontydd rydych wedi defnyddio, enw'r pecyn a defnyddwyd, yr negeseuon a rhoddwyd allan gan Tor, ayyb." + +#: lib/bridgedb/templates/bridges.html:10 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "I defnyddio'r llinellau uwchben, cer i tydalen osodiadau Vidalia's Network, ac pwyswch \"Mae fy ISP yn wahardd cysylltiadau i'r rhwydwaith Tor.\" Wedyn, ychwanegwch pob gyfeiriad pont, un ar amser." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Nid oes pontydd ar gael" + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Diweddarwch eich porwr i Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Teipiwch y ddau air" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Cam 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Cael gafael ar y %s Pecyn Porwr Tor %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Cam 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Cael gafael ar %s pontydd %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Cam 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Nawr %s ychwanegwch y pontydd i Tor %s" diff --git a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po index 14a6ab5..923e096 100644 --- a/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po +++ b/lib/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po @@ -3,16 +3,18 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Translators: +# Francesca Ciceri <madamezou(a)zouish.org>, 2014 # ironbishop <ironbishop(a)fsfe.org>, 2011 -# Random_R <rand(a)yopmail.com>, 2013 +# Random_R, 2013 # fetidyoo <tru74368(a)yahoo.com>, 2011 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-03-27 21:41+0000\n" -"PO-Revision-Date: 2013-05-05 13:00+0000\n" -"Last-Translator: Random_R <rand(a)yopmail.com>\n" +"PO-Revision-Date: 2014-04-24 12:26+0000\n" +"Last-Translator: Francesca Ciceri <madamezou(a)zouish.org>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +31,7 @@ msgstr "Cosa sono i bridge?" #, python-format msgid "" "%s Bridge relays %s are Tor relays that help you circumvent censorship." -msgstr "%s I relay bridge %s sono relay Tor che ti aiutano ad eludere le censure." +msgstr "%s I relay bridge %s sono relay Tor che ti aiutano ad eludere la censura." #: lib/bridgedb/templates/base.html:39 msgid "I need an alternative way of getting bridges!" @@ -41,7 +43,7 @@ msgid "" "Another way to find public bridge addresses is to send an email (from a %s " "or a %s address) to %s with the line 'get bridges' by itself in the body of " "the mail." -msgstr "Un altro metodo per trovare bridge pubblici è di inviare un'email (da un %s o un indirizzo %s) a %s con la sola frase 'get bridges' nel corpo dell'email." +msgstr "Un altro metodo per trovare bridge pubblici è di inviare una email (da un %s o un indirizzo %s) a %s contenente la sola frase \"get bridges\"." #: lib/bridgedb/templates/base.html:48 msgid "My bridges don't work! I need help!" @@ -53,7 +55,7 @@ msgid "" "If your Tor doesn't work, you should email %s. Try including as much info " "about your case as you can, including the list of bridges you used, the " "bundle filename/version you used, the messages that Tor gave out, etc." -msgstr "Se il tuo Tor non funziona, manda un'email a %s. Cerca di fornire più informazioni possibili sul tuo problema, inclusa la lista dei bridge che hai usato, nome e versione del bundle in uso, i messaggi ricevuti da Tor, ecc." +msgstr "Se il tuo Tor non funziona, manda una email a %s. Cerca di fornire più informazioni possibili sul tuo problema, inclusa la lista dei bridge che hai usato, nome e versione del bundle in uso, i messaggi ricevuti da Tor, ecc." #: lib/bridgedb/templates/bridges.html:10 msgid "" diff --git a/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po b/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po new file mode 100644 index 0000000..e982650 --- /dev/null +++ b/lib/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po @@ -0,0 +1,102 @@ +# Translations template for BridgeDB. +# Copyright (C) 2013 ORGANIZATION +# This file is distributed under the same license as the BridgeDB project. +# +# Translators: +# Translators: +# Michelozzo <michalslovak2(a)hotmail.com>, 2013 +# Svistwarrior273 <romanbeno273(a)gmail.com>, 2014 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2013-03-27 21:41+0000\n" +"PO-Revision-Date: 2014-03-27 09:10+0000\n" +"Last-Translator: Svistwarrior273 <romanbeno273(a)gmail.com>\n" +"Language-Team: Slovak (http://www.transifex.com/projects/p/torproject/language/sk/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: Babel 0.9.6\n" +"Language: sk\n" +"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + +#: lib/bridgedb/templates/base.html:33 +msgid "What are bridges?" +msgstr "Čo sú to premostenia?" + +#: lib/bridgedb/templates/base.html:34 +#, python-format +msgid "" +"%s Bridge relays %s are Tor relays that help you circumvent censorship." +msgstr "%s premostovacie relé %s sú také relé Toru, ktoré vám pomôžu obchádzať cenzúru." + +#: lib/bridgedb/templates/base.html:39 +msgid "I need an alternative way of getting bridges!" +msgstr "Potrebujem iný spôsob ako získať premostenia!" + +#: lib/bridgedb/templates/base.html:40 +#, python-format +msgid "" +"Another way to find public bridge addresses is to send an email (from a %s " +"or a %s address) to %s with the line 'get bridges' by itself in the body of " +"the mail." +msgstr "Ďalším spôsobom zistenia verejných adries mostov je zaslať email (z adries %s alebo %s) na %s s telom správy obsahujúcim riadok 'get bridges'." + +#: lib/bridgedb/templates/base.html:48 +msgid "My bridges don't work! I need help!" +msgstr "Moje premostenia nefungujú! Potrebujem pomoc!" + +#: lib/bridgedb/templates/base.html:49 +#, python-format +msgid "" +"If your Tor doesn't work, you should email %s. Try including as much info " +"about your case as you can, including the list of bridges you used, the " +"bundle filename/version you used, the messages that Tor gave out, etc." +msgstr "Ak váš Tor nefunguje, mali by ste zaslať email na adresu %s. Pokúste sa zahrnúť všetky vám známe fakty, vrátane zoznamu vami využívaných mostov, názov/verziu používanej verzie Bundle, všetky správy vypísané Torom, atď." + +#: lib/bridgedb/templates/bridges.html:10 +msgid "" +"To use the above lines, go to Vidalia's Network settings page, and click " +"\"My ISP blocks connections to the Tor network\". Then add each bridge " +"address one at a time." +msgstr "Ak chcete využiť vyššie uvedené, navštívte stránku Nastavenia siete vo Vidalii a kliknite na \"Môj ISP blokuje pripojenia k sieti Toru\". Potom postupne pridávajte adresy premostení jednu za druhou." + +#: lib/bridgedb/templates/bridges.html:13 +msgid "No bridges currently available" +msgstr "Momentálne nie sú dostupné žiadne premostenia." + +#: lib/bridgedb/templates/captcha.html:6 +msgid "Upgrade your browser to Firefox" +msgstr "Aktualizujte váš prehliadač na Firefox" + +#: lib/bridgedb/templates/captcha.html:8 +msgid "Type the two words" +msgstr "Napíšte dve slová" + +#: lib/bridgedb/templates/index.html:6 +msgid "Step 1" +msgstr "Krok 1" + +#: lib/bridgedb/templates/index.html:8 +#, python-format +msgid "Get %s Tor Browser Bundle %s" +msgstr "Získajte %s Tor Browser Bundle %s" + +#: lib/bridgedb/templates/index.html:13 +msgid "Step 2" +msgstr "Krok 2" + +#: lib/bridgedb/templates/index.html:15 +#, python-format +msgid "Get %s bridges %s" +msgstr "Získajte %s premostenia %s" + +#: lib/bridgedb/templates/index.html:19 +msgid "Step 3" +msgstr "Krok 3" + +#: lib/bridgedb/templates/index.html:21 +#, python-format +msgid "Now %s add the bridges to Tor %s" +msgstr "Teraz %s pridajte premostenia k Toru %s"

1 0

[bridgedb/develop] Remove unused travis OS dependencies.
by isis＠torproject.org 01 May '14

01 May '14

commit 8d1eb42183d469bf868fd05c6fea0dfa600ab3c5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:08:05 2014 +0000 Remove unused travis OS dependencies. --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7aef0ca..69f1c19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,9 +19,7 @@ notifications: before_install: - sudo apt-get update # Distro development header/library/resource/buildtime dependencies - - sudo apt-get install --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev libgeoip-dev geoip-database - # Distro python dependencies - - sudo apt-get install --no-install-suggests --no-install-recommends python-dev python-setuptools + - sudo apt-get install --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools python: - "2.7"

1 0

[bridgedb/develop] Add coverage rcfile for travis commands.
by isis＠torproject.org 01 May '14

01 May '14

commit f736ed17d3184d90f50f95d2bd838e0d619f45b3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:08:55 2014 +0000 Add coverage rcfile for travis commands. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 69f1c19..4a21528 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,8 @@ install: - make install script: - - coverage run $(which trial) ./lib/bridgedb/test/test_*.py - - coverage report + - coverage run --rcfile=".coveragerc" $(which trial) ./lib/bridgedb/test/test_*.py + - coverage report --rcfile=".coveragerc" after_success: - coveralls

1 0

[bridgedb/develop] Remove very old and unnecessary argparse dependency.
by isis＠torproject.org 01 May '14

01 May '14

commit b794bddf6409550d0fb677525f052bc5853dc4b0 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:09:42 2014 +0000 Remove very old and unnecessary argparse dependency. It appears to be breaking CI builds: https://travis-ci.org/isislovecruft/bridgedb/builds/24138587 --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2d1be77..80ebcb5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,4 +11,3 @@ pygpgme==0.3 recaptcha==1.0rc1 recaptcha-client==1.0.6 zope.interface>=4.0.5 -argparse==1.2.1

1 0

[bridgedb/develop] Separate coverage commands in Makefile so that .travis.yml can use them.
by isis＠torproject.org 01 May '14

01 May '14

commit 662a07ea0fd04e4a89ebb8da18f3e5e3a2f0be16 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:18:01 2014 +0000 Separate coverage commands in Makefile so that .travis.yml can use them. Because we only want the first two commands to run on TravisCI. This changes nothing for the `make coverage` directive, it'll still function in the same way. --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 22a231e..aa594c1 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,11 @@ clean: -rm -rf lib/bridgedb.egg-info -rm -rf _trial_temp -coverage: +coverage-test: -coverage run --rcfile=".coveragerc" $(TRIAL) ./lib/bridgedb/test/test_*.py -coverage report --rcfile=".coveragerc" + +coverage-html: -coverage html --rcfile=".coveragerc" + +coverage: coverage-test coverage-html

1 0

[bridgedb/develop] Add missing parens after call to _getRotatingFileHandler in util.
by isis＠torproject.org 01 May '14

01 May '14

commit 0c1e12efb4ea61f2ba88c16a71fc627f5fb06de2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:54:33 2014 +0000 Add missing parens after call to _getRotatingFileHandler in util. --- lib/bridgedb/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 691b9bc..5b0cd48 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -111,7 +111,7 @@ def configureLogging(cfg): 'level': logLevel, 'formatter': 'default', 'filters': logFilters}, - 'rotating': {'()': _getRotatingFileHandler, + 'rotating': {'()': _getRotatingFileHandler(), 'level': logLevel, 'formatter': 'default', 'filters': logFilters,

1 0

[bridgedb/develop] Remove unused dependencies recaptcha and MarkupSafe from requirements.txt.
by isis＠torproject.org 01 May '14

01 May '14

commit b8ef7459f6cc821f100efe35100177c7b2bdaa9b Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:21:59 2014 +0000 Remove unused dependencies recaptcha and MarkupSafe from requirements.txt. --- requirements.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 80ebcb5..f07f1a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,11 @@ Babel==0.9.6 BeautifulSoup==3.2.1 Mako==0.8.1 -MarkupSafe==0.18 Twisted==13.1.0 https://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz#sha1=c608450b07… pycrypto==2.6.1 pyOpenSSL==0.13.1 pygeoip==0.2.7 pygpgme==0.3 -recaptcha==1.0rc1 recaptcha-client==1.0.6 zope.interface>=4.0.5

1 0

[bridgedb/develop] Switch to Makefile `coverage-test` directive in .travis.yml.
by isis＠torproject.org 01 May '14

01 May '14

commit bcacd84c6bf3876280cc1f704cc2db8f18e2d67d Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 22:52:08 2014 +0000 Switch to Makefile `coverage-test` directive in .travis.yml. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4a21528..09bfe59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,7 @@ install: - make install script: - - coverage run --rcfile=".coveragerc" $(which trial) ./lib/bridgedb/test/test_*.py - - coverage report --rcfile=".coveragerc" + - make coverage-test after_success: - coveralls

1 0

[bridgedb/develop] Set a default logfile name, otherwise chowning chokes on it.
by isis＠torproject.org 01 May '14

01 May '14

commit b4cae6df49d334f15cd80f87149f1c38991ea298 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 23:22:34 2014 +0000 Set a default logfile name, otherwise chowning chokes on it. --- lib/bridgedb/util.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index cc9c65d..00e4ce5 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -84,7 +84,7 @@ def configureLogging(cfg): level = getattr(cfg, 'LOGLEVEL', 'WARNING') logLevel = getattr(logging, level, 0) logStderr = getattr(cfg, 'LOG_TO_STDERR', False) - logfileName = getattr(cfg, 'LOGFILE', "") + logfileName = getattr(cfg, 'LOGFILE', "bridgedb.log") logfileCount = getattr(cfg, 'LOGFILE_COUNT', 3) - 1 logfileRotateSize = getattr(cfg, 'LOGFILE_ROTATE_SIZE', 10000000) logThreads = getattr(cfg, 'LOG_THREADS', False)

1 0

[bridgedb/develop] Fix problems with rotating logfile handler in newest python2.7.6.
by isis＠torproject.org 01 May '14

01 May '14

commit 09b2db614e6ed2916ca10b04848e9e3904e7f358 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Apr 30 23:20:35 2014 +0000 Fix problems with rotating logfile handler in newest python2.7.6. --- lib/bridgedb/util.py | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/lib/bridgedb/util.py b/lib/bridgedb/util.py index 5b0cd48..cc9c65d 100644 --- a/lib/bridgedb/util.py +++ b/lib/bridgedb/util.py @@ -11,6 +11,8 @@ """Common utilities for BridgeDB.""" +from functools import partial + import logging import logging.config import logging.handlers @@ -33,16 +35,16 @@ def _getLogHandlers(logToFile=True, logToStderr=True): logHandlers.append('console') return logHandlers -def _getRotatingFileHandler(filename, mode='a', filesize=1000000, filecount=0, +def _getRotatingFileHandler(filename, mode='a', maxBytes=1000000, backupCount=0, encoding='utf-8', uid=None, gid=None): """Get a :class:`logging.RotatingFileHandler` with a logfile which is readable+writable only by the given **uid** and **gid**. :param str filename: The full path to the log file. :param str mode: The mode to open **filename** with. (default: ``'a'``) - :param int filesize: Rotate logfiles after they have grown to this size in + :param int maxBytes: Rotate logfiles after they have grown to this size in bytes. - :param int filecount: The number of logfiles to keep in rotation. + :param int backupCount: The number of logfiles to keep in rotation. :param str encoding: The encoding for the logfile. :param int uid: The owner UID to set on the logfile. :param int gid: The GID to set on the logfile. @@ -59,10 +61,12 @@ def _getRotatingFileHandler(filename, mode='a', filesize=1000000, filecount=0, os.chown(filename, uid, gid) os.chmod(filename, os.ST_WRITE | os.ST_APPEND) - fileHandler = logging.handlers.RotatingFileHandler(filename, mode, - maxBytes=filesize, - backupCount=filecount, - encoding=encoding) + fileHandler = partial(logging.handlers.RotatingFileHandler, + filename, + mode, + maxBytes=maxBytes, + backupCount=backupCount, + encoding=encoding) return fileHandler def configureLogging(cfg): @@ -111,15 +115,12 @@ def configureLogging(cfg): 'level': logLevel, 'formatter': 'default', 'filters': logFilters}, - 'rotating': {'()': _getRotatingFileHandler(), + 'rotating': {'()': _getRotatingFileHandler(logfileName, 'a', + logfileRotateSize, + logfileCount), 'level': logLevel, 'formatter': 'default', - 'filters': logFilters, - # The values below are passed to the handler creator, - # :func:`getChownedFileHandler`, as kwargs: - 'filename': logfileName, - 'filesize': logfileRotateSize, - 'filecount': logfileCount}, + 'filters': logFilters}, }, 'root': { 'handlers': _getLogHandlers(logfileName, logStderr),

1 0