json-friendly debug messages. fix #659

This commit is contained in:
ThomasV 2014-04-17 17:20:07 +02:00
parent 3e1a87397d
commit 696766c370
3 changed files with 7 additions and 3 deletions

View File

@ -25,7 +25,7 @@ import traceback
import json
import Queue
from network import Network
from util import print_msg
from util import print_msg, print_stderr
from simple_config import SimpleConfig
@ -60,7 +60,7 @@ class NetworkProxy(threading.Thread):
return False
elif not daemon_started:
print "Starting daemon [%s]"%self.config.get('server')
print_stderr( "Starting daemon [%s]"%self.config.get('server'))
daemon_started = True
pid = os.fork()
if (pid == 0): # The first child.

View File

@ -397,7 +397,7 @@ class Interface(threading.Thread):
print_error("certificate has expired:", cert_path)
os.unlink(cert_path)
else:
print_msg("wrong certificate", self.host)
print_error("wrong certificate", self.host)
return
except Exception:
print_error("wrap_socket failed", self.host)

View File

@ -17,8 +17,12 @@ def set_verbosity(b):
global is_verbose
is_verbose = b
def print_error(*args):
if not is_verbose: return
print_stderr(*args)
def print_stderr(*args):
args = [str(item) for item in args]
sys.stderr.write(" ".join(args) + "\n")
sys.stderr.flush()