Skip to content

Commit 455ac33

Browse files
Removing remains of "rlog" module, fixes db unit test debug logging via environment variable.
1 parent a18e5f0 commit 455ac33

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Features:
5151

5252
Fixed:
5353

54+
- Removed some old left over "rlog" references in documentation and code.
55+
Makes the debugging.txt advise for the database unit tests work again.
5456
- Fixed OpenPGP support for modern versions of libgpgme. (Bernhard Reiter)
5557
- Restored compatibility with old style trackers (anatoly techtonik)
5658
- Make roundup play nice with setup tools (for using with virtualenv)

doc/admin_guide.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ Configuring Roundup's Logging of Messages For Sysadmins
4242
=======================================================
4343

4444
You may configure where Roundup logs messages in your tracker's config.ini
45-
file. Roundup will use the standard Python (2.3+) logging implementation
46-
when available. If not, then a very basic logging implementation will be used
47-
(see BasicLogging in the roundup.rlog module for details).
45+
file. Roundup will use the standard Python (2.3+) logging implementation.
4846

4947
Configuration for standard "logging" module:
5048
- tracker configuration file specifies the location of a logging

roundup/configuration.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,9 +1305,6 @@ class CoreConfig(Config):
13051305
Core config has a predefined layout (see the SETTINGS structure),
13061306
supports loading of old-style pythonic configurations and holds
13071307
three additional attributes:
1308-
logging:
1309-
instance logging engine, from standard python logging module
1310-
or minimalistic logger implemented in Roundup
13111308
detectors:
13121309
user-defined configuration for detectors
13131310
ext:

test/db_test_base.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
1717

1818
import unittest, os, shutil, errno, imp, sys, time, pprint, base64, os.path
19+
import logging
1920
import gpgmelib
2021
from email.parser import FeedParser
2122

@@ -34,7 +35,6 @@
3435
config.RDBMS_USER = "rounduptest"
3536
config.RDBMS_PASSWORD = "rounduptest"
3637
config.RDBMS_TEMPLATE = "template0"
37-
#config.logging = MockNull()
3838
# these TRACKER_WEB and MAIL_DOMAIN values are used in mailgw tests
3939
config.MAIL_DOMAIN = "your.tracker.email.domain.example"
4040
config.TRACKER_WEB = "http://tracker.example/cgi-bin/roundup.cgi/bugs/"
@@ -128,10 +128,8 @@ def open_database(self):
128128

129129

130130
if os.environ.has_key('LOGGING_LEVEL'):
131-
from roundup import rlog
132-
config.logging = rlog.BasicLogging()
133-
config.logging.setLevel(os.environ['LOGGING_LEVEL'])
134-
config.logging.getLogger('roundup.hyperdb').setFormat('%(message)s')
131+
logger = logging.getLogger('roundup.hyperdb')
132+
logger.setLevel(os.environ['LOGGING_LEVEL'])
135133

136134
class commonDBTest(MyTestCase):
137135
def setUp(self):

0 commit comments

Comments
 (0)