log diversion stdout

[hippotat.git] / hippotat / __init__.py

diff --git a/hippotat/__init__.py b/hippotat/__init__.py
index 5d5129a86fe74eba3c6961f44e53699a2a7b48c2..fa43065759d82332d9f61c5b4d8305c5346bf32c 100644 (file)
--- a/hippotat/__init__.py
+++ b/hippotat/__init__.py
@@ -53,7 +53,7 @@ def log_debug(dflag, msg, idof=None, d=None):
   if idof is not None:
     msg = '[%#x] %s' % (id(idof), msg)
   if d is not None:
-    d = d[0:64]
+    #d = d[0:64]
     d = _hex_codec(d)[0].decode('ascii')
     msg += ' ' + d
   log.info('{dflag} {msgcore}', dflag=dflag, msgcore=msg)
@@ -63,11 +63,11 @@ defcfg = '''
 #[<client>] overrides
 max_batch_down = 65536           # used by server, subject to [limits]
 max_queue_time = 10              # used by server, subject to [limits]
-max_request_time = 54            # used by server, subject to [limits]
 target_requests_outstanding = 3  # must match; subject to [limits] on server
+http_timeout = 30                # used by both } must be
+http_timeout_grace = 5           # used by both }  compatible
 max_requests_outstanding = 4     # used by client
 max_batch_up = 4000              # used by client
-http_timeout = 30                # used by client
 http_retry = 5                   # used by client
 
 #[server] or [<client>] overrides
@@ -96,7 +96,7 @@ port = 80                  # used by server
 [limits]
 max_batch_down = 262144           # used by server
 max_queue_time = 121              # used by server
-max_request_time = 121            # used by server
+http_timeout = 121                # used by server
 target_requests_outstanding = 10  # used by server
 '''
 
@@ -171,9 +171,8 @@ class SlipStreamDecoder():
 
   def inputdata(self, data):
     self._log('inputdata', d=data)
-    data = self._buffer + data
-    self._buffer = b''
     packets = slip.decode(data)
+    packets[0] = self._buffer + packets[0]
     self._buffer = packets.pop()
     for packet in packets:
       self._maybe_packet(packet)
@@ -370,7 +369,12 @@ def process_cfg_clients(constructor):
 
 def common_startup():
   log_formatter = twisted.logger.formatEventAsClassicLogText
-  log_observer = twisted.logger.FileLogObserver(sys.stderr, log_formatter)
+  stdout_obs = twisted.logger.FileLogObserver(sys.stdout, log_formatter)
+  stderr_obs = twisted.logger.FileLogObserver(sys.stderr, log_formatter)
+  pred = twisted.logger.LogLevelFilterPredicate(LogLevel.error)
+  log_observer = twisted.logger.FilteringLogObserver(
+    stderr_obs, [pred], stdout_obs
+  )
   twisted.logger.globalLogBeginner.beginLoggingTo(
     [ log_observer, crash_on_critical ]
     )