From 568bef8e52af59020006e02c90288e6f47124a65 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期六, 22 六月 2019 14:54:12 +0800
Subject: [PATCH] mv real_max from PollConfig to LocalConfig
---
sysset.proto | 8 ++--
sysset.pb.go | 92 +++++++++++++++++++++++-----------------------
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/sysset.pb.go b/sysset.pb.go
index 3eeb7f2..72a5a57 100644
--- a/sysset.pb.go
+++ b/sysset.pb.go
@@ -36,6 +36,7 @@
Reserved string `protobuf:"bytes,13,opt,name=reserved,proto3" json:"reserved,omitempty"`
GateWay string `protobuf:"bytes,14,opt,name=gate_way,json=gateWay,proto3" json:"gate_way,omitempty"`
NetMask string `protobuf:"bytes,15,opt,name=net_mask,json=netMask,proto3" json:"net_mask,omitempty"`
+ RealMax int32 `protobuf:"varint,16,opt,name=real_max,json=realMax,proto3" json:"real_max,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -171,12 +172,18 @@
return ""
}
+func (m *LocalConfig) GetRealMax() int32 {
+ if m != nil {
+ return m.RealMax
+ }
+ return 0
+}
+
type PollConfig struct {
ServerId string `protobuf:"bytes,1,opt,name=server_id,json=serverId,proto3" json:"server_id,omitempty"`
- RealMax int32 `protobuf:"varint,2,opt,name=real_max,json=realMax,proto3" json:"real_max,omitempty"`
- PollPeriod int32 `protobuf:"varint,3,opt,name=poll_period,json=pollPeriod,proto3" json:"poll_period,omitempty"`
- Delay int32 `protobuf:"varint,4,opt,name=delay,proto3" json:"delay,omitempty"`
- Enable bool `protobuf:"varint,5,opt,name=enable,proto3" json:"enable,omitempty"`
+ PollPeriod int32 `protobuf:"varint,2,opt,name=poll_period,json=pollPeriod,proto3" json:"poll_period,omitempty"`
+ Delay int32 `protobuf:"varint,3,opt,name=delay,proto3" json:"delay,omitempty"`
+ Enable bool `protobuf:"varint,4,opt,name=enable,proto3" json:"enable,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -212,13 +219,6 @@
return m.ServerId
}
return ""
-}
-
-func (m *PollConfig) GetRealMax() int32 {
- if m != nil {
- return m.RealMax
- }
- return 0
}
func (m *PollConfig) GetPollPeriod() int32 {
@@ -410,39 +410,39 @@
func init() { proto.RegisterFile("sysset.proto", fileDescriptor_5be590c6b2a0d755) }
var fileDescriptor_5be590c6b2a0d755 = []byte{
- // 536 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0x5d, 0x8a, 0xdb, 0x30,
- 0x10, 0xc6, 0xc9, 0x3a, 0xb1, 0xc7, 0xe9, 0xb6, 0x88, 0xfe, 0x78, 0xd3, 0xbf, 0x34, 0x4f, 0x81,
- 0x42, 0x1e, 0xda, 0x23, 0x6c, 0x5f, 0x0c, 0xcd, 0x12, 0xcc, 0x42, 0x1f, 0x8d, 0x62, 0x4d, 0x83,
- 0x58, 0xdb, 0x12, 0x92, 0xb2, 0x89, 0xcf, 0xd1, 0xa3, 0xf4, 0x1c, 0x3d, 0x46, 0xef, 0x51, 0x24,
- 0xd9, 0x49, 0x76, 0x0b, 0xa5, 0x4f, 0xf6, 0x7c, 0xdf, 0x7c, 0xa3, 0x6f, 0x34, 0x1a, 0x98, 0xe8,
- 0x56, 0x6b, 0x34, 0x4b, 0xa9, 0x84, 0x11, 0x24, 0x72, 0x9f, 0x5a, 0x6f, 0xe7, 0xbf, 0x87, 0x90,
- 0x7c, 0x15, 0x25, 0xad, 0xae, 0x45, 0xf3, 0x9d, 0x6f, 0xc9, 0x6b, 0x88, 0x35, 0xaa, 0x7b, 0x54,
- 0x05, 0x67, 0x69, 0x30, 0x0b, 0x16, 0x71, 0x1e, 0x79, 0x20, 0x63, 0xe4, 0x3d, 0x24, 0x1d, 0xd9,
- 0xd0, 0x1a, 0xd3, 0x81, 0xa3, 0xc1, 0x43, 0x37, 0xb4, 0xc6, 0xb3, 0x04, 0xd3, 0x4a, 0x4c, 0x87,
- 0xb3, 0x60, 0x11, 0xf6, 0x09, 0xb7, 0xad, 0xc4, 0xf3, 0xf2, 0x32, 0xbd, 0x78, 0x50, 0x5e, 0x92,
- 0x2b, 0x88, 0x68, 0x45, 0x55, 0x6d, 0xb9, 0xd0, 0x71, 0x63, 0x17, 0x67, 0x92, 0xbc, 0x05, 0xf0,
- 0x94, 0x14, 0xca, 0xa4, 0x23, 0x57, 0x37, 0x76, 0xc8, 0x5a, 0x28, 0x43, 0xde, 0x00, 0xec, 0x71,
- 0x53, 0x48, 0x5e, 0x5a, 0xed, 0xd8, 0xd7, 0xdd, 0xe3, 0x66, 0xcd, 0xcb, 0x4c, 0x92, 0x19, 0x4c,
- 0x7a, 0xd6, 0xc9, 0x23, 0x6f, 0xcb, 0xf3, 0x4e, 0x3f, 0x85, 0x18, 0x75, 0x2f, 0x8f, 0xfd, 0xd1,
- 0xa8, 0xbd, 0xfa, 0x1d, 0x24, 0x1d, 0xe7, 0xc4, 0xe0, 0xcf, 0x76, 0xac, 0xd3, 0x2e, 0xe0, 0x59,
- 0xb9, 0x33, 0x45, 0x4d, 0x0f, 0x05, 0xdb, 0x29, 0x6a, 0xb8, 0x68, 0xd2, 0xc4, 0x25, 0x5d, 0x96,
- 0x3b, 0xb3, 0xa2, 0x87, 0x2f, 0x1d, 0x7a, 0xcc, 0xe4, 0xcd, 0x29, 0x73, 0x72, 0xca, 0xe4, 0xcd,
- 0x31, 0x73, 0x0a, 0x91, 0x42, 0x77, 0x2f, 0x2c, 0x7d, 0xe2, 0xbb, 0xe9, 0x63, 0x7b, 0x4b, 0x5b,
- 0x6a, 0xb0, 0xd8, 0xd3, 0x36, 0xbd, 0xf4, 0x56, 0x6d, 0xfc, 0x8d, 0xb6, 0x96, 0x6a, 0xd0, 0x5a,
- 0xd1, 0x77, 0xe9, 0x53, 0x4f, 0x35, 0x68, 0x56, 0x54, 0xdf, 0xcd, 0x7f, 0x04, 0x00, 0x6b, 0x51,
- 0xfd, 0xd7, 0x98, 0xaf, 0xec, 0xe9, 0xb4, 0xb2, 0x2d, 0xb9, 0x19, 0x87, 0xf9, 0xd8, 0xc6, 0x2b,
- 0x7a, 0xb0, 0x03, 0x96, 0xa2, 0xaa, 0x0a, 0x89, 0x8a, 0x0b, 0xd6, 0x0f, 0xd8, 0x42, 0x6b, 0x87,
- 0x90, 0xe7, 0x10, 0x32, 0xac, 0x68, 0xeb, 0x86, 0x1b, 0xe6, 0x3e, 0x20, 0x2f, 0x61, 0x84, 0x0d,
- 0xdd, 0x54, 0xe8, 0xe6, 0x1a, 0xe5, 0x5d, 0x34, 0xff, 0x19, 0xc0, 0xf8, 0xba, 0xda, 0x69, 0x83,
- 0xca, 0x8e, 0xb8, 0xf4, 0xbf, 0x27, 0x4f, 0x71, 0x87, 0x64, 0x8c, 0x7c, 0x80, 0x49, 0x4f, 0x9f,
- 0x3d, 0xbe, 0xa4, 0xc3, 0xdc, 0xeb, 0x9b, 0x42, 0x24, 0xa9, 0xd6, 0x7b, 0xa1, 0xbc, 0xb3, 0x38,
- 0x3f, 0xc6, 0xb6, 0xfa, 0x3d, 0x57, 0x66, 0x47, 0xab, 0xd3, 0xcb, 0x8b, 0x3b, 0x24, 0x93, 0xe4,
- 0x23, 0x84, 0x8d, 0x60, 0xa8, 0xd3, 0x70, 0x36, 0x5c, 0x24, 0x9f, 0x5e, 0x2c, 0xfb, 0x05, 0x59,
- 0x76, 0xf6, 0x6e, 0x04, 0xc3, 0xdc, 0xe7, 0xcc, 0x7f, 0x05, 0x90, 0x9c, 0xc1, 0xe4, 0x12, 0x06,
- 0x47, 0xc7, 0x03, 0xce, 0x1e, 0x75, 0x32, 0x78, 0xdc, 0xc9, 0x83, 0xbb, 0x1f, 0xfe, 0x7b, 0xc5,
- 0x2e, 0xfe, 0x5a, 0xb1, 0x57, 0x30, 0xb6, 0x2e, 0xac, 0xd6, 0xef, 0xc8, 0xc8, 0x86, 0x19, 0x3b,
- 0x11, 0xd2, 0xed, 0x47, 0x4f, 0x48, 0x5b, 0xb2, 0x54, 0x68, 0x9f, 0x8c, 0xe1, 0x35, 0x76, 0xdb,
- 0x01, 0x1e, 0xba, 0xe5, 0x35, 0x6e, 0x46, 0xae, 0xd9, 0xcf, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff,
- 0x64, 0x0a, 0xad, 0x64, 0x24, 0x04, 0x00, 0x00,
+ // 531 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x53, 0xcd, 0x8e, 0xda, 0x3e,
+ 0x10, 0x17, 0x2c, 0x81, 0x64, 0xc2, 0x9f, 0xff, 0xca, 0xea, 0x87, 0x4b, 0xbf, 0x28, 0x27, 0xa4,
+ 0x4a, 0x1c, 0xda, 0x47, 0xd8, 0x5e, 0x22, 0x95, 0x15, 0x42, 0x2b, 0xf5, 0x18, 0x99, 0x78, 0x8a,
+ 0xac, 0x4d, 0x62, 0xcb, 0x36, 0x0b, 0xb9, 0xf5, 0x9d, 0xfa, 0x1c, 0x7d, 0xa7, 0xca, 0x76, 0x02,
+ 0xec, 0x56, 0xaa, 0x7a, 0x4a, 0xe6, 0xf7, 0x31, 0x33, 0xb6, 0x67, 0x60, 0x6c, 0x1a, 0x63, 0xd0,
+ 0x2e, 0x95, 0x96, 0x56, 0x92, 0xd8, 0x7f, 0x2a, 0xb3, 0x9b, 0xff, 0x18, 0x40, 0xfa, 0x55, 0x16,
+ 0xac, 0xbc, 0x91, 0xf5, 0x77, 0xb1, 0x23, 0xaf, 0x21, 0x31, 0xa8, 0x1f, 0x50, 0xe7, 0x82, 0xd3,
+ 0xde, 0xac, 0xb7, 0x48, 0x36, 0x71, 0x00, 0x32, 0x4e, 0xde, 0x43, 0xda, 0x92, 0x35, 0xab, 0x90,
+ 0xf6, 0x3d, 0x0d, 0x01, 0xba, 0x65, 0x15, 0x5e, 0x08, 0x6c, 0xa3, 0x90, 0x5e, 0xcd, 0x7a, 0x8b,
+ 0xa8, 0x13, 0xdc, 0x35, 0x0a, 0x2f, 0xd3, 0x2b, 0x3a, 0x78, 0x94, 0x5e, 0x91, 0x57, 0x10, 0xb3,
+ 0x92, 0xe9, 0xca, 0x71, 0x91, 0xe7, 0x46, 0x3e, 0xce, 0x14, 0x79, 0x0b, 0x10, 0x28, 0x25, 0xb5,
+ 0xa5, 0x43, 0x9f, 0x37, 0xf1, 0xc8, 0x5a, 0x6a, 0x4b, 0xde, 0x00, 0x1c, 0x70, 0x9b, 0x2b, 0x51,
+ 0x38, 0xef, 0x28, 0xe4, 0x3d, 0xe0, 0x76, 0x2d, 0x8a, 0x4c, 0x91, 0x19, 0x8c, 0x3b, 0xd6, 0xdb,
+ 0xe3, 0xd0, 0x56, 0xe0, 0xbd, 0x7f, 0x0a, 0x09, 0x9a, 0xce, 0x9e, 0x84, 0xd2, 0x68, 0x82, 0xfb,
+ 0x1d, 0xa4, 0x2d, 0xe7, 0xcd, 0x10, 0x6a, 0x7b, 0xd6, 0x7b, 0x17, 0x70, 0x5d, 0xec, 0x6d, 0x5e,
+ 0xb1, 0x63, 0xce, 0xf7, 0x9a, 0x59, 0x21, 0x6b, 0x9a, 0x7a, 0xd1, 0xa4, 0xd8, 0xdb, 0x15, 0x3b,
+ 0x7e, 0x69, 0xd1, 0x93, 0x52, 0xd4, 0x67, 0xe5, 0xf8, 0xac, 0x14, 0xf5, 0x49, 0x39, 0x85, 0x58,
+ 0xa3, 0xbf, 0x17, 0x4e, 0xff, 0x0b, 0xa7, 0xe9, 0x62, 0x77, 0x4b, 0x3b, 0x66, 0x31, 0x3f, 0xb0,
+ 0x86, 0x4e, 0x42, 0xab, 0x2e, 0xfe, 0xc6, 0x1a, 0x47, 0xd5, 0xe8, 0x5a, 0x31, 0xf7, 0xf4, 0xff,
+ 0x40, 0xd5, 0x68, 0x57, 0xcc, 0xdc, 0x3b, 0x4a, 0x23, 0x2b, 0x5d, 0x9b, 0xf4, 0xda, 0xd7, 0x1c,
+ 0xb9, 0x78, 0xc5, 0x8e, 0xf3, 0x23, 0xc0, 0x5a, 0x96, 0xff, 0x3a, 0x00, 0x4a, 0x96, 0x65, 0xae,
+ 0x50, 0x0b, 0xc9, 0xfd, 0x00, 0x44, 0x1b, 0x70, 0xd0, 0xda, 0x23, 0xe4, 0x19, 0x44, 0x1c, 0x4b,
+ 0xd6, 0xb4, 0x4f, 0x1f, 0x02, 0xf2, 0x02, 0x86, 0x58, 0xb3, 0x6d, 0x89, 0xfe, 0xc9, 0xe3, 0x4d,
+ 0x1b, 0xcd, 0x7f, 0xf6, 0x60, 0x74, 0x53, 0xee, 0x8d, 0x45, 0xed, 0x5e, 0xb8, 0x08, 0xbf, 0xe7,
+ 0xc2, 0x49, 0x8b, 0x64, 0x9c, 0x7c, 0x80, 0x71, 0x47, 0x5f, 0xcc, 0x5e, 0xda, 0x62, 0x7e, 0xf8,
+ 0xa6, 0x10, 0x2b, 0x66, 0xcc, 0x41, 0x6a, 0xee, 0xcb, 0x27, 0x9b, 0x53, 0xec, 0xb2, 0x3f, 0x08,
+ 0x6d, 0xf7, 0xac, 0x3c, 0x0f, 0x5e, 0xd2, 0x22, 0x99, 0x22, 0x1f, 0x21, 0xaa, 0x25, 0x47, 0x43,
+ 0xa3, 0xd9, 0xd5, 0x22, 0xfd, 0xf4, 0x7c, 0xd9, 0xed, 0xc7, 0xb2, 0x6d, 0xef, 0x56, 0x72, 0xdc,
+ 0x04, 0xcd, 0xfc, 0x57, 0x0f, 0xd2, 0x0b, 0x98, 0x4c, 0xa0, 0x7f, 0xea, 0xb8, 0x2f, 0xf8, 0x93,
+ 0x93, 0xf4, 0x9f, 0x9e, 0xe4, 0xd1, 0x05, 0x5f, 0xfd, 0x7d, 0xc3, 0x06, 0x7f, 0x6c, 0xd8, 0x4b,
+ 0x18, 0xb9, 0x2e, 0x9c, 0x37, 0xac, 0xc8, 0xd0, 0x85, 0x19, 0x3f, 0x13, 0xca, 0xaf, 0x47, 0x47,
+ 0x28, 0x97, 0xb2, 0xd0, 0xe8, 0x26, 0xc6, 0x8a, 0x0a, 0xdb, 0xe5, 0x80, 0x00, 0xdd, 0x89, 0x0a,
+ 0xb7, 0x43, 0x7f, 0xd8, 0xcf, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2b, 0xd8, 0x92, 0x94, 0x23,
+ 0x04, 0x00, 0x00,
}
diff --git a/sysset.proto b/sysset.proto
index b372c6c..9c83c6a 100644
--- a/sysset.proto
+++ b/sysset.proto
@@ -19,14 +19,14 @@
string gate_way = 14;
string net_mask = 15;
+ int32 real_max = 16;//瀹炴椂澶勭悊鐨勬渶澶ц矾鏁�
}
message PollConfig {
string server_id = 1;//鏈嶅姟鍣╥d
- int32 real_max = 2;//瀹炴椂澶勭悊鐨勬渶澶ц矾鏁�
- int32 poll_period = 3;//杞鍛ㄦ湡
- int32 delay = 4;//寤惰繜鏃堕棿
- bool enable = 5;//鏄惁鍚敤
+ int32 poll_period = 2;//杞鍛ㄦ湡
+ int32 delay = 3;//寤惰繜鏃堕棿
+ bool enable = 4;//鏄惁鍚敤杞
}
message Cluster {
--
Gitblit v1.8.0