maryjane/syncevolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

syncevo-http-server: fixed printing of server debug output

Browse source 
Python failed to call logSyncEvoOutput() after adding the additional
'process' parameter to LogOutput because it extracts all four
parameters and then cannot pass them to logSyncEvoOutput().

Now logSyncEvoOutput() uses the new process information to instantiate
a logger with the right prefix, using 'sync' as fallback for messages
without that information (as before).
This commit is contained in:
Patrick Ohly 2012-09-10 14:51:21 +02:00
parent de77d5796d
commit af59e95e2d
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
test/syncevo-http-server.py
View file

@ -32,9 +32,6 @@ from OpenSSL import SSL
# for output from this script itself
logger = logging.getLogger("syncevo-http")
# for output from core SyncEvolution
loggerCore = logging.getLogger("sync")
class ChainedOpenSSLContextFactory(ssl.DefaultOpenSSLContextFactory):
def __init__(self, privateKeyFileName, certificateChainFileName,
sslmethod = SSL.SSLv3_METHOD):
@ -372,8 +369,8 @@ evo2python = {
"WARNING": logging.WARNING
}
def logSyncEvoOutput(path, level, output):
loggerCore.log(evo2python.get(level, logging.ERROR), "%s: %s", path, output)
def logSyncEvoOutput(path, level, output, component):
logging.getLogger(component or 'sync').log(evo2python.get(level, logging.ERROR), "%s: %s", path, output)
usage = """usage: %prog [options] http://localhost:<port>/<path>