Merge pull request Kong#1069 from Mashape/fix/cli-prepare

Closes Kong#1066
c3p0hz · Mar 11, 2016 · d0573cf · d0573cf
2 parents 8b46eeb + 53cfdce
commit d0573cf
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/kong/cli/utils/services.lua b/kong/cli/utils/services.lua
@@ -140,9 +140,13 @@ function _M.start_all(configuration, configuration_path)
   end
 
   for _, v in ipairs(services) do
-    local obj = v(configuration, configuration_path)
-    obj:prepare()
-    local ok, err = obj:start()
+    local service = v(configuration, configuration_path)
+    local ok, err
+    ok, err = service:prepare()
+    if not ok then
+      return ok, err
+    end
+    ok, err = service:start()
     if not ok then
       return ok, err
     end