Merge pull request #103 from dtynn/feature/reqid

请求错误信息中加入reqid

Author: longbai

qiniu/rpc.py

@@ -42,7 +42,10 @@ def call_with(self, path, body, content_type=None, content_length=None):
 
         if resp.status / 100 != 2:
             err_msg = ret if "error" not in ret else ret["error"]
+            reqid = resp.getheader("X-Reqid", None)
             detail = resp.getheader("x-log", None)
+            if reqid is not None:
+                err_msg += ", reqid:%s" % reqid
             if detail is not None:
                 err_msg += ", detail:%s" % detail
 

qiniu/test/io_test.py

@@ -172,6 +172,12 @@ def test_put_crc_fail(self):
         ret, err = io.put(policy.token(), key, data, extra)
         assert err is not None
 
+    def test_put_fail_reqid(self):
+        key = "test_%s" % r(9)
+        data = "hello bubby!"
+        ret, err = io.put("", key, data, extra)
+        assert "reqid" in err
+
 
 class Test_get_file_crc32(unittest.TestCase):