Using log level

[metaproxy-moved-to-github.git] / src / filter_http_rewrite.cpp

diff --git a/src/filter_http_rewrite.cpp b/src/filter_http_rewrite.cpp
index e64fb36..e937a73 100644 (file)
--- a/src/filter_http_rewrite.cpp
+++ b/src/filter_http_rewrite.cpp
@@ -48,6 +48,7 @@ yf::HttpRewrite::~HttpRewrite()
 
 void yf::HttpRewrite::process(mp::Package & package) const 
 {
+    yaz_log(YLOG_LOG, "HttpRewrite begins....");
     Z_GDU *gdu = package.request().get();
     //map of request/response vars
     std::map<std::string, std::string> vars;
@@ -56,8 +57,8 @@ void yf::HttpRewrite::process(mp::Package & package) const
     {
         Z_HTTP_Request *hreq = gdu->u.HTTP_Request;
         mp::odr o;
-        std::cout << ">> Request headers" << std::endl;
         rewrite_reqline(o, hreq, vars);
+        yaz_log(YLOG_LOG, ">> Request headers");
         rewrite_headers(o, hreq->headers, vars);
         rewrite_body(o, &hreq->content_buf, &hreq->content_len, vars);
         package.request() = gdu;
@@ -67,9 +68,9 @@ void yf::HttpRewrite::process(mp::Package & package) const
     if (gdu && gdu->which == Z_GDU_HTTP_Response)
     {
         Z_HTTP_Response *hres = gdu->u.HTTP_Response;
-        std::cout << "Response " << hres->code;
-        std::cout << "<< Respose headers" << std::endl;
+        yaz_log(YLOG_LOG, "Response code %d", hres->code);
         mp::odr o;
+        yaz_log(YLOG_LOG, "<< Respose headers");
         rewrite_headers(o, hres->headers, vars);
         rewrite_body(o, &hres->content_buf, &hres->content_len, vars);
         package.response() = gdu;
@@ -83,22 +84,25 @@ void yf::HttpRewrite::rewrite_reqline (mp::odr & o, Z_HTTP_Request *hreq,
     std::string path;
     if (strstr(hreq->path, "http://") == hreq->path)
     {
-        std::cout << "Path in the method line is absolute, " 
-            "possibly a proxy request\n";
+        yaz_log(YLOG_LOG, "Path in the method line is absolute, " 
+            "possibly a proxy request");
         path += hreq->path;
     }
     else
     {
         //TODO what about proto
+        path += "http://";
         path += z_HTTP_header_lookup(hreq->headers, "Host");
         path += hreq->path; 
     }
-    std::cout << "Proxy request URL is " << path << std::endl;
+    yaz_log(YLOG_LOG, "Proxy request URL is %s", path.c_str());
     std::string npath = 
         test_patterns(vars, path, req_uri_pats, req_groups_bynum);
-    std::cout << "Resp request URL is " << npath << std::endl;
     if (!npath.empty())
+    {
+        yaz_log(YLOG_LOG, "Rewritten request URL is %s", npath.c_str());
         hreq->path = odr_strdup(o, npath.c_str());
+    }
 }
 
 void yf::HttpRewrite::rewrite_headers (mp::odr & o, Z_HTTP_Header *headers,
@@ -111,7 +115,7 @@ void yf::HttpRewrite::rewrite_headers (mp::odr & o, Z_HTTP_Header *headers,
         std::string sheader(header->name);
         sheader += ": ";
         sheader += header->value;
-        std::cout << header->name << ": " << header->value << std::endl;
+        yaz_log(YLOG_LOG, "%s: %s", header->name, header->value);
         std::string out = test_patterns(vars, 
                 sheader, 
                 req_uri_pats, req_groups_bynum);
@@ -120,7 +124,7 @@ void yf::HttpRewrite::rewrite_headers (mp::odr & o, Z_HTTP_Header *headers,
             size_t pos = out.find(": ");
             if (pos == std::string::npos)
             {
-                std::cout << "Header malformed during rewrite, ignoring";
+                yaz_log(YLOG_LOG, "Header malformed during rewrite, ignoring");
                 continue;
             }
             header->name = odr_strdup(o, out.substr(0, pos).c_str());
@@ -157,7 +161,7 @@ const std::string yf::HttpRewrite::test_patterns(
         const std::vector<std::map<int, std::string> > & groups_bynum_vec)
     const
 {
-    for (int i = 0; i < uri_pats.size(); i++) 
+    for (unsigned i = 0; i < uri_pats.size(); i++) 
     {
         std::string out = search_replace(vars, txt, 
                 uri_pats[i].first, uri_pats[i].second,
@@ -203,7 +207,8 @@ const std::string yf::HttpRewrite::search_replace(
         //rewrite value
         std::string rhvalue = what.prefix().str() 
             + rvalue + what.suffix().str();
-        std::cout << "! Rewritten '"+what.str(0)+"' to '"+rvalue+"'\n";
+        yaz_log(YLOG_LOG, "! Rewritten '%s' to '%s'", 
+                what.str(0).c_str(), rvalue.c_str());
         out += rhvalue;
         start = what[0].second; //move search forward
     }
@@ -214,7 +219,7 @@ void yf::HttpRewrite::parse_groups(
         const spair_vec & uri_pats,
         std::vector<std::map<int, std::string> > & groups_bynum_vec)
 {
-    for (int h = 0; h < uri_pats.size(); h++) 
+    for (unsigned h = 0; h < uri_pats.size(); h++) 
     {
         int gnum = 0;
         bool esc = false;
@@ -222,7 +227,7 @@ void yf::HttpRewrite::parse_groups(
         std::string str = uri_pats[h].first;
         //for each pair we have an indexing map
         std::map<int, std::string> groups_bynum;
-        for (int i = 0; i < str.size(); ++i)
+        for (unsigned i = 0; i < str.size(); ++i)
         {
             if (!esc && str[i] == '\\')
             {
@@ -265,8 +270,8 @@ void yf::HttpRewrite::parse_groups(
                                 ("Unterminated group name '" + gname 
                                  + " in '" + str +"'");
                         groups_bynum[gnum] = gname;
-                        std::cout << "Found named group '" << gname 
-                            << "' at $" << gnum << std::endl;
+                        yaz_log(YLOG_LOG, "Found named group '%s' at $%d",
+                                gname.c_str(), gnum);
                     }
                 }
             }
@@ -281,7 +286,7 @@ std::string yf::HttpRewrite::sub_vars (const std::string & in,
 {
     std::string out;
     bool esc = false;
-    for (int i = 0; i < in.size(); ++i)
+    for (unsigned i = 0; i < in.size(); ++i)
     {
         if (!esc && in[i] == '\\')
         {
@@ -360,13 +365,15 @@ static void configure_rules(const xmlNode *ptr, yf::HttpRewrite::spair_vec & des
                          + std::string((const char *) attr->name)
                          + " in rewrite section of http_rewrite");
             }
+            yaz_log(YLOG_LOG, "Found rewrite rule from '%s' to '%s'", 
+                    from.c_str(), to.c_str());
             if (!from.empty())
                 dest.push_back(std::make_pair(from, to));
         }
         else
         {
             throw mp::filter::FilterException
-                ("Bad element "
+                ("Bad element o"
                  + std::string((const char *) ptr->name)
                  + " in http_rewrite1 filter");
         }
@@ -384,11 +391,11 @@ void yf::HttpRewrite::configure(const xmlNode * ptr, bool test_only,
             continue;
         else if (!strcmp((const char *) ptr->name, "request"))
         {
-            configure_rules(ptr->children, req_uri_pats);
+            configure_rules(ptr, req_uri_pats);
         }
         else if (!strcmp((const char *) ptr->name, "response"))
         {
-            configure_rules(ptr->children, res_uri_pats);
+            configure_rules(ptr, res_uri_pats);
         }
         else
         {
@@ -398,6 +405,7 @@ void yf::HttpRewrite::configure(const xmlNode * ptr, bool test_only,
                  + " in http_rewrite1 filter");
         }
     }
+    configure(req_uri_pats, res_uri_pats);
 }
 
 static mp::filter::Base* filter_creator()