remove NewAttrStore field on Server - unused

This commit is contained in:
Matt Jaffee 2018-06-20 11:14:09 -05:00
parent e94feba37e
commit 7a05f32a17
No known key found for this signature in database
GPG key ID: 08A3DFFF987B11BF
2 changed files with 1 additions and 6 deletions

View file

@ -66,7 +66,6 @@ type Server struct {
BroadcastReceiver BroadcastReceiver
systemInfo SystemInfo
gcNotifier GCNotifier
NewAttrStore func(string) AttrStore
logger Logger
ln net.Listener
@ -109,7 +108,6 @@ func OptServerDataDir(dir string) ServerOption {
func OptServerAttrStoreFunc(af func(string) AttrStore) ServerOption {
return func(s *Server) error {
s.NewAttrStore = af
s.Holder.NewAttrStore = af
return nil
}
@ -232,8 +230,6 @@ func NewServer(opts ...ServerOption) (*Server, error) {
gcNotifier: NopGCNotifier,
NewAttrStore: NewNopAttrStore,
antiEntropyInterval: time.Minute * 10,
metricInterval: 0,
diagnosticInterval: 0,

View file

@ -164,8 +164,7 @@ func (m *Main) Reopen() error {
return errors.Wrap(err, "setting up server")
}
m.Server.NewAttrStore = boltdb.NewAttrStore
m.Server.Holder.NewAttrStore = m.Server.NewAttrStore
m.Server.Holder.NewAttrStore = boltdb.NewAttrStore
// Run new program.
if err := m.Start(); err != nil {