瀏覽代碼

Improve Debug::Acquire::http debug output

Prefix all answers with the URL that the answer is for. This
helps when debugging and pipeline is enabled.
Michael Vogt 12 年之前
父節點
當前提交
9622b21110
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 4 3
      methods/server.cc
  2. 1 1
      methods/server.h

+ 4 - 3
methods/server.cc

@@ -44,7 +44,8 @@ time_t ServerMethod::FailTime = 0;
 // ---------------------------------------------------------------------
 // ---------------------------------------------------------------------
 /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header
 /* Returns 0 if things are OK, 1 if an IO error occurred and 2 if a header
    parse error occurred */
    parse error occurred */
-ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File)
+ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File,
+                                                      const std::string &Uri)
 {
 {
    State = Header;
    State = Header;
    
    
@@ -66,7 +67,7 @@ ServerState::RunHeadersResult ServerState::RunHeaders(FileFd * const File)
 	 continue;
 	 continue;
 
 
       if (Owner->Debug == true)
       if (Owner->Debug == true)
-	 clog << Data;
+	 clog << "Answer for: " << Uri << endl << Data;
       
       
       for (string::const_iterator I = Data.begin(); I < Data.end(); ++I)
       for (string::const_iterator I = Data.begin(); I < Data.end(); ++I)
       {
       {
@@ -478,7 +479,7 @@ int ServerMethod::Loop()
       Fetch(0);
       Fetch(0);
       
       
       // Fetch the next URL header data from the server.
       // Fetch the next URL header data from the server.
-      switch (Server->RunHeaders(File))
+      switch (Server->RunHeaders(File, Queue->Uri))
       {
       {
 	 case ServerState::RUN_HEADERS_OK:
 	 case ServerState::RUN_HEADERS_OK:
 	 break;
 	 break;

+ 1 - 1
methods/server.h

@@ -68,7 +68,7 @@ struct ServerState
       RUN_HEADERS_PARSE_ERROR
       RUN_HEADERS_PARSE_ERROR
    };
    };
    /** \brief Get the headers before the data */
    /** \brief Get the headers before the data */
-   RunHeadersResult RunHeaders(FileFd * const File);
+   RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri);
 
 
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
    virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;
    virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;