From 249bbb0e7abbc692a82c75976a9ab915c0ac6492 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 24 May 2019 18:31:05 -0700 Subject: [PATCH] store where the config file is Signed-off-by: Jeff Carr --- config.pb.go | 48 ++++++++++++++++++++++++++++-------------------- config.proto | 3 ++- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/config.pb.go b/config.pb.go index 970144d..808bc6e 100644 --- a/config.pb.go +++ b/config.pb.go @@ -27,7 +27,8 @@ type Config struct { Hostname string `protobuf:"bytes,4,opt,name=hostname,proto3" json:"hostname,omitempty"` Debugging bool `protobuf:"varint,5,opt,name=debugging,proto3" json:"debugging,omitempty"` Debugtable bool `protobuf:"varint,6,opt,name=debugtable,proto3" json:"debugtable,omitempty"` - Accounts []*Config_Account `protobuf:"bytes,7,rep,name=accounts,proto3" json:"accounts,omitempty"` + Filename string `protobuf:"bytes,7,opt,name=filename,proto3" json:"filename,omitempty"` + Accounts []*Config_Account `protobuf:"bytes,8,rep,name=accounts,proto3" json:"accounts,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -100,6 +101,13 @@ func (m *Config) GetDebugtable() bool { return false } +func (m *Config) GetFilename() string { + if m != nil { + return m.Filename + } + return "" +} + func (m *Config) GetAccounts() []*Config_Account { if m != nil { return m.Accounts @@ -202,23 +210,23 @@ func init() { func init() { proto.RegisterFile("config.proto", fileDescriptor_3eaf2c85e69e9ea4) } var fileDescriptor_3eaf2c85e69e9ea4 = []byte{ - // 279 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xcf, 0x4e, 0xb4, 0x30, - 0x14, 0xc5, 0xc3, 0x30, 0xfc, 0xbb, 0xf3, 0xad, 0x9a, 0x2f, 0xa6, 0x19, 0x8d, 0x21, 0xae, 0x58, - 0xb1, 0xd0, 0x85, 0x6b, 0x63, 0xdc, 0x9b, 0x1a, 0x1f, 0xa0, 0x40, 0xa7, 0x34, 0xe3, 0xb4, 0x84, - 0x96, 0xf0, 0x30, 0x3e, 0x8a, 0x2f, 0x67, 0x7a, 0x3b, 0x8c, 0xe8, 0xee, 0x9e, 0x73, 0x2e, 0xe4, - 0xfc, 0x6e, 0xe1, 0x5f, 0x6b, 0xf4, 0x41, 0xc9, 0x7a, 0x18, 0x8d, 0x33, 0x64, 0x37, 0x2b, 0xf7, - 0xea, 0xa7, 0x66, 0x3a, 0xdc, 0x7d, 0xc6, 0x90, 0x3e, 0x63, 0x4a, 0x08, 0x6c, 0xdf, 0xdf, 0x5e, - 0x18, 0x8d, 0xca, 0xa8, 0x2a, 0x18, 0xce, 0xe4, 0x3f, 0x24, 0xb3, 0xea, 0x5c, 0x4f, 0x37, 0x65, - 0x54, 0x25, 0x2c, 0x08, 0x72, 0x05, 0x69, 0x2f, 0x94, 0xec, 0x1d, 0x8d, 0xd1, 0x3e, 0x2b, 0xb2, - 0x87, 0xbc, 0x37, 0xd6, 0x69, 0x7e, 0x12, 0x74, 0x8b, 0x7f, 0xb9, 0x68, 0x72, 0x03, 0x45, 0x27, - 0x9a, 0x49, 0x4a, 0xa5, 0x25, 0x4d, 0xca, 0xa8, 0xca, 0xd9, 0x8f, 0x41, 0x6e, 0x01, 0x50, 0x38, - 0xde, 0x7c, 0x08, 0x9a, 0x62, 0xbc, 0x72, 0xc8, 0x23, 0xe4, 0xbc, 0x6d, 0xcd, 0xa4, 0x9d, 0xa5, - 0x59, 0x19, 0x57, 0xbb, 0xfb, 0xeb, 0x7a, 0x85, 0x51, 0x07, 0x84, 0xfa, 0x29, 0xec, 0xb0, 0xcb, - 0xf2, 0xfe, 0x2b, 0x82, 0xec, 0xec, 0x7a, 0x40, 0xad, 0xda, 0xe3, 0x02, 0xe8, 0x67, 0x5f, 0x79, - 0xb2, 0x62, 0xc4, 0xca, 0x9b, 0x50, 0x79, 0xd1, 0x1e, 0xde, 0x99, 0xa3, 0xd0, 0x48, 0x59, 0xb0, - 0x20, 0xfc, 0x17, 0x03, 0xb7, 0x76, 0x36, 0x63, 0xb7, 0x40, 0x2e, 0xfa, 0xd7, 0x01, 0x92, 0x3f, - 0x07, 0xf0, 0x88, 0xe6, 0xc4, 0x95, 0xc6, 0x34, 0xc5, 0x74, 0xe5, 0xf8, 0x76, 0x83, 0x19, 0x1d, - 0xcd, 0xf0, 0xa4, 0x38, 0x37, 0x29, 0xbe, 0xd8, 0xc3, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x57, - 0x19, 0xe1, 0xc9, 0xc1, 0x01, 0x00, 0x00, + // 288 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xbf, 0x4e, 0xc3, 0x30, + 0x10, 0xc6, 0x95, 0xb6, 0x49, 0x93, 0x2b, 0x93, 0x85, 0x90, 0x55, 0x10, 0x8a, 0x98, 0x32, 0x65, + 0x80, 0x81, 0x19, 0x21, 0x76, 0x64, 0xc4, 0x03, 0xe4, 0x8f, 0xe3, 0x58, 0x6d, 0xed, 0x28, 0x76, + 0x94, 0x47, 0x63, 0xe0, 0xe5, 0x90, 0xcf, 0x75, 0x09, 0x6c, 0xf7, 0xfb, 0xee, 0x72, 0x97, 0xef, + 0x33, 0x5c, 0x35, 0x5a, 0x75, 0x52, 0x94, 0xc3, 0xa8, 0xad, 0x26, 0xbb, 0x59, 0xda, 0x77, 0x57, + 0xd5, 0x53, 0xf7, 0xf0, 0xb5, 0x86, 0xe4, 0x15, 0xbb, 0x84, 0xc0, 0xe6, 0xf3, 0xe3, 0x8d, 0xd1, + 0x28, 0x8f, 0x8a, 0x8c, 0x61, 0x4d, 0xae, 0x21, 0x9e, 0x65, 0x6b, 0x7b, 0xba, 0xca, 0xa3, 0x22, + 0x66, 0x1e, 0xc8, 0x0d, 0x24, 0x3d, 0x97, 0xa2, 0xb7, 0x74, 0x8d, 0xf2, 0x99, 0xc8, 0x1e, 0xd2, + 0x5e, 0x1b, 0xab, 0xaa, 0x13, 0xa7, 0x1b, 0xdc, 0x72, 0x61, 0x72, 0x07, 0x59, 0xcb, 0xeb, 0x49, + 0x08, 0xa9, 0x04, 0x8d, 0xf3, 0xa8, 0x48, 0xd9, 0xaf, 0x40, 0xee, 0x01, 0x10, 0x6c, 0x55, 0x1f, + 0x39, 0x4d, 0xb0, 0xbd, 0x50, 0xdc, 0xe6, 0x4e, 0x1e, 0x39, 0x6e, 0xde, 0xfa, 0xcd, 0x81, 0xc9, + 0x33, 0xa4, 0x55, 0xd3, 0xe8, 0x49, 0x59, 0x43, 0xd3, 0x7c, 0x5d, 0xec, 0x1e, 0x6f, 0xcb, 0x85, + 0xc5, 0xd2, 0xdb, 0x2b, 0x5f, 0xfc, 0x0c, 0xbb, 0x0c, 0xef, 0xbf, 0x23, 0xd8, 0x9e, 0x55, 0x67, + 0x5e, 0xc9, 0xe6, 0x10, 0xcc, 0xbb, 0xda, 0x1d, 0x9d, 0x0c, 0x1f, 0xf1, 0xe8, 0xca, 0x1f, 0x0d, + 0xec, 0x82, 0xb1, 0xfa, 0xc0, 0x15, 0x26, 0x90, 0x31, 0x0f, 0xee, 0x8b, 0xa1, 0x32, 0x66, 0xd6, + 0x63, 0x1b, 0x02, 0x08, 0xfc, 0x27, 0x9c, 0xf8, 0x5f, 0x38, 0xce, 0xbe, 0x3e, 0x55, 0x52, 0x61, + 0x37, 0xc1, 0xee, 0x42, 0x71, 0x7f, 0x37, 0xe8, 0xd1, 0xa2, 0xf5, 0x98, 0x61, 0x5d, 0x27, 0xf8, + 0x9a, 0x4f, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x97, 0x86, 0x08, 0x1c, 0xdd, 0x01, 0x00, 0x00, } diff --git a/config.proto b/config.proto index 4ae6130..0ed11b3 100644 --- a/config.proto +++ b/config.proto @@ -8,8 +8,9 @@ message Config { string hostname = 4; bool debugging = 5; bool debugtable = 6; + string filename = 7; - repeated Account accounts = 7; + repeated Account accounts = 8; message Account { string nick = 1;