better config errors

[hippotat.git] / client

diff --git a/client b/client
index a5edd7eef802e37c00dc35e9a7d790bfc63b0b11..e5d4e0005092b3e7ebf842788c17d44145bfa7c4 100755 (executable)
--- a/client
+++ b/client
@@ -81,7 +81,7 @@ class ResponseConsumer(GeneralResponseConsumer):
     self._log(DBG.HTTP_CTRL, '__init__')
 
   def dataReceived(self, data):
-    self._log(DBG.HTTP_CTRL, 'dataReceived', d=data)
+    self._log(DBG.HTTP, 'dataReceived', d=data)
     try:
       self._ssd.inputdata(data)
     except Exception as e:
@@ -93,6 +93,7 @@ class ResponseConsumer(GeneralResponseConsumer):
       self.latefailure()
       return
     try:
+      self._log(DBG.HTTP, 'ResponseDone')
       self._ssd.flush()
       req_fin(self._req)
     except Exception as e:
@@ -102,7 +103,7 @@ class ResponseConsumer(GeneralResponseConsumer):
     self._latefailure(traceback.format_exc())
 
   def _latefailure(self, reason):
-    self._log(DBG.HTTP_CTRL, '_asyncFailure ' + str(reason))
+    self._log(DBG.HTTP_CTRL, '_latefailure ' + str(reason))
     req_err(self._req, reason)
 
 class ErrorResponseConsumer(twisted.internet.protocol.Protocol):
@@ -229,8 +230,7 @@ def check_outbound():
 
   log_outstanding()
 
-common_startup()
-process_cfg()
+common_startup(process_cfg)
 start_client()
 start_ipif(c.ipif_command, outbound)
 check_outbound()