[apisix-dashboard] branch master updated: fix: we need conf.json when deploying manager-api in local (#409)

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 292c118  fix:  we need conf.json when deploying manager-api in local  (#409)
292c118 is described below

commit 292c1180deb1935b8bf9f62158f94c0c973c9488
Author: kv <gx...@163.com>
AuthorDate: Wed Aug 26 10:55:32 2020 +0800

    fix:  we need conf.json when deploying manager-api in local  (#409)
    
    * fix: we need conf.json when deploying manager-api in loal
    
    * fix: log error when starting manager failed
---
 api/main.go    | 4 +++-
 api/run/run.sh | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/api/main.go b/api/main.go
index 15010ee..9c4918f 100644
--- a/api/main.go
+++ b/api/main.go
@@ -40,5 +40,7 @@ func main() {
 		ReadTimeout:  time.Duration(1000) * time.Millisecond,
 		WriteTimeout: time.Duration(5000) * time.Millisecond,
 	}
-	s.ListenAndServe()
+	if err := s.ListenAndServe(); err != nil {
+		panic(err)
+	}
 }
diff --git a/api/run/run.sh b/api/run/run.sh
index f47d089..4bb26dc 100755
--- a/api/run/run.sh
+++ b/api/run/run.sh
@@ -18,7 +18,7 @@
 
 pwd=`pwd`
 
-cp ${pwd}/api/conf.json ${pwd}/conf.json
+cp ${pwd}/api/conf/conf_preview.json ${pwd}/conf.json
 
 export MYSQL_SERVER_ADDRESS="127.0.0.1:3306"
 export MYSQL_USER=root