add log support

algo/goexstrategy.go

@@ -39,6 +39,7 @@ type GoExStrategy struct {
 }
 
 func (s *GoExStrategy) Setup(params []goalgo.ExchangeParams) error {
+	log.Printf("GoExStrategy Setup")
 	s.Exchanges = []goex.API{}
 	for _, p := range params {
 		log.Print(p)
@@ -52,7 +53,7 @@ func (s *GoExStrategy) Setup(params []goalgo.ExchangeParams) error {
 
 func (s *GoExStrategy) createExchange(params goalgo.ExchangeParams) goex.API {
 	b := builder.NewAPIBuilder()
-	exName, ok := goExExchangeNameMap[params.Exchange]
+	exName, ok := goExExchangeNameMap[params.Name]
 	if !ok {
 		return nil
 	}

basestrategy.go

@@ -58,11 +58,32 @@ func (s *BaseStrategy) run() {
 		s.state = RStateStopped
 		return
 	}
-	s.state = RStateRunning
+
 	strategy.Init()
-	strategy.Setup(nil)
 	s.state = RStateInitialized
+
+	client := GetClient()
+	exchanges, err := client.GetRobotExchangeInfo("", id)
+	if err != nil {
+		log.Printf("GetRobotExchangeInfo error: %v", err)
+	} else {
+		params := []ExchangeParams{}
+		for _, ex := range exchanges {
+			params = append(params, ExchangeParams{
+				Label:     ex.Label,
+				Name:      ex.Name,
+				AccessKey: ex.AccessKey,
+				SecretKey: ex.SecretKey,
+			})
+		}
+		log.Printf("Setup...")
+		strategy.Setup(params)
+		log.Printf("Setup.")
+	}
+
+	s.state = RStateRunning
 	strategy.Run()
+
 	log.Printf("Run done")
 	s.state = RStateStopped
 }

grpc_broker.proto

@@ -4,10 +4,29 @@ package goalgo;
 
 // The robot control service definition.
 service RobotCtl {
+  // 获取交易所配置
+  rpc GetRobotExchangeInfo (RobotExchangeInfoRequest) returns (RobotExchangeInfoReply) {}
+
   // 写入日志
   rpc Log (LogRequest) returns (LogReply) {}
 }
 
+message RobotExchangeInfoRequest {
+  string uid = 1;
+  string robot_id = 2;
+}
+
+message RobotExchangeInfo {
+  string label = 1;
+  string name = 2;
+  string access_key = 3;
+  string secret_key = 4;
+}
+
+message RobotExchangeInfoReply {
+  repeated RobotExchangeInfo exchanges = 1;
+}
+
 message LogRequest {
   int32 sid = 1;
   uint64 id = 2;