Merge be87d56 into f17fc25

apache · Dec 17, 2017 · 7011142 · 7011142
2 parents f17fc25 + be87d56
commit 7011142
Show file tree

Hide file tree

Showing 35 changed files with 1,280 additions and 208 deletions.
diff --git a/etc/conf/app.conf b/etc/conf/app.conf
@@ -27,9 +27,9 @@ registry_plugin = etcd
 
 # registry address
 # registry_plugin equals to 'embeded_etcd', example:
-# manager_name = "sr-0"
-# manager_addr = "http://127.0.0.1:9982"
-# manager_cluster = "sr-0=http://127.0.0.1:9982"
+# manager_name = "sc-0"
+# manager_addr = "http://127.0.0.1:2380"
+# manager_cluster = "sc-0=http://127.0.0.1:2380"
 # registry_plugin equals to 'etcd'
 manager_cluster = "127.0.0.1:2379"
 

diff --git a/frontend/main.go b/frontend/main.go
@@ -20,9 +20,9 @@ import (
 	"flag"
 	"fmt"
 	"github.com/ServiceComb/service-center/frontend/schema"
+	"github.com/astaxie/beego"
 	"log"
 	"net/http"
-	"github.com/astaxie/beego"
 	//"strconv"
 )
 
@@ -50,7 +50,6 @@ func main() {
 
 	log.Printf("Running on port %d\n", *port)
 
-
 	addr := fmt.Sprintf("%s:%d", frontendIp, *port)
 	// this call blocks -- the progam runs here forever
 	err = http.ListenAndServe(addr, nil)