change: all of the config were put under /apisix/.

README.md

@@ -12,6 +12,7 @@ APISIX is a cloud-native microservices API gateway, delivering the ultimate perf
 
 ### CentOS
 #### Dependencies
+
 - OpenResty
 ```shell
 sudo yum install yum-utils
@@ -76,7 +77,7 @@ curl http://127.0.0.1:2379/v2/keys/apisix/routes/1 -X PUT -d value='{"methods":[
 ```
 
 ```shell
-curl -i -H 'host:baidu.com' 127.0.0.1:9080/hello
+curl -i -H 'Host: baidu.com' 127.0.0.1:9080/hello
 ```
 
 

conf/config.yaml

@@ -1,5 +1,6 @@
 etcd:
   host: "http://127.0.0.1:2379"
+  prefix: "/v2/keys/apisix"
   timeout: 60
 
 plugins:

lua/apisix/balancer.lua

@@ -82,7 +82,7 @@ end
 
 function _M.init_worker()
     local err
-    upstreams_etcd, err = core.config.new("/user_upstreams",
+    upstreams_etcd, err = core.config.new("/upstreams",
                                           {automatic = true})
     if not upstreams_etcd then
         error("failed to create etcd instance to fetch upstream: " .. err)

lua/apisix/core/config_etcd.lua

@@ -21,7 +21,12 @@ local _M = {
     version = 0.1,
     local_conf = fetch_local_conf,
 }
-local mt = {__index = _M}
+local mt = {
+    __index = _M,
+    __tostring = function(self)
+        return " etcd key: " .. self.key
+    end
+}
 
 
 local function readdir(etcd_cli, key)
@@ -176,19 +181,29 @@ local function _automatic_fetch(premature, self)
         return
     end
 
-    -- optimize: avoid to use this timer always.
-    while not exiting() and self.running do
+    local i = 0
+    while not exiting() and self.running and i <= 32 do
+        i = i + 1
         local ok, res, err = pcall(self.fetch, self)
         if not ok then
             err = res
-            log.error("failed to fetch data from etcd: ", err)
+            log.error("failed to fetch data from etcd: ", err, ", ",
+                      tostring(self))
             ngx_sleep(10)
+            break
 
-        elseif not res and err and err ~= "timeout" then
-            log.error("failed to fetch data from etcd: ", err)
+        elseif not res and err and err ~= "timeout"
+            and err ~= "Key not found" then
+            log.error("failed to fetch data from etcd: ", err, ", ",
+                      tostring(self))
             ngx_sleep(5)
+            break
         end
     end
+
+    if not exiting() and self.running then
+        ngx_timer_at(0, _automatic_fetch, self)
+    end
 end
 
 

lua/apisix/core/response.lua

@@ -43,7 +43,7 @@ function resp_exit(code, ...)
                 insert_tab(t, idx, body)
             end
 
-        else
+        elseif v ~= nil then
             idx = idx + 1
             insert_tab(t, idx, v)
         end

lua/apisix/plugins/limit-count.lua

@@ -38,11 +38,11 @@ function _M.access(conf, ctx)
     if not delay then
         local err = remaining
         if err == "rejected" then
-            return core.response.say(conf.rejected_code)
+            return conf.rejected_code
         end
 
         core.log.error("failed to limit req: ", err)
-        return core.response.say(500)
+        return 500
     end
 
     core.response.set_header("X-RateLimit-Limit", conf.count)

lua/apisix/route.lua

@@ -32,16 +32,16 @@ end
 
 function _M.get()
     -- core.log.warn("conf_routes.version: ", conf_routes.version)
-    return core.lrucache.global("/user_routes", conf_routes.version,
+    return core.lrucache.global("/routes", conf_routes.version,
                                 create_r3_router, conf_routes.values)
 end
 
 
 function _M.init_worker()
     local err
-    conf_routes, err = core.config.new("/user_routes", {automatic = true})
+    conf_routes, err = core.config.new("/routes", {automatic = true})
     if not conf_routes then
-        error("failed to create etcd instance to fetch /user_routes "
+        error("failed to create etcd instance to fetch /routes "
               .. "automaticly: " .. err)
     end
 end

lua/apisix/service.lua

@@ -15,7 +15,7 @@ end
 
 function _M.init_worker()
     local err
-    services, err = core.config.new("/user_services", {automatic = true})
+    services, err = core.config.new("/services", {automatic = true})
     if not services then
         error("failed to create etcd instance to fetch upstream: " .. err)
         return