store/server: normalized error messages/formatting

This commit is contained in:
Leo Balduf 2016-03-11 21:12:43 +01:00
parent 1ba0f92ceb
commit eca7d9ee72
5 changed files with 7 additions and 10 deletions

View file

@ -39,10 +39,7 @@ func Register(name string, con Constructor) {
func New(cfg *chihaya.ServerConfig, tkr *tracker.Tracker) (Server, error) {
con, ok := constructors[cfg.Name]
if !ok {
return nil, fmt.Errorf(
"server: unknown Constructor %q (forgotten import?)",
cfg.Name,
)
return nil, fmt.Errorf("server: unknown Constructor %q (forgotten import?)", cfg.Name)
}
return con(cfg, tkr)
}

View file

@ -42,7 +42,7 @@ func RegisterClientStoreDriver(name string, driver ClientStoreDriver) {
func OpenClientStore(cfg *DriverConfig) (ClientStore, error) {
driver, ok := clientStoreDrivers[cfg.Name]
if !ok {
return nil, fmt.Errorf("store: unknown driver %q (forgotten import?)", cfg)
return nil, fmt.Errorf("store: unknown ClientStoreDriver %q (forgotten import?)", cfg)
}
return driver.New(cfg)

View file

@ -60,10 +60,10 @@ type IPStoreDriver interface {
// it panics.
func RegisterIPStoreDriver(name string, driver IPStoreDriver) {
if driver == nil {
panic("store: could not register nil ClientStoreDriver")
panic("store: could not register nil IPStoreDriver")
}
if _, dup := ipStoreDrivers[name]; dup {
panic("store: could not register duplicate ClientStoreDriver: " + name)
panic("store: could not register duplicate IPStoreDriver: " + name)
}
ipStoreDrivers[name] = driver
}
@ -72,7 +72,7 @@ func RegisterIPStoreDriver(name string, driver IPStoreDriver) {
func OpenIPStore(cfg *DriverConfig) (IPStore, error) {
driver, ok := ipStoreDrivers[cfg.Name]
if !ok {
return nil, fmt.Errorf("store: unknown driver %q (forgotten import?)", cfg)
return nil, fmt.Errorf("store: unknown IPStoreDriver %q (forgotten import?)", cfg)
}
return driver.New(cfg)

View file

@ -52,7 +52,7 @@ func RegisterPeerStoreDriver(name string, driver PeerStoreDriver) {
func OpenPeerStore(cfg *DriverConfig) (PeerStore, error) {
driver, ok := peerStoreDrivers[cfg.Name]
if !ok {
return nil, fmt.Errorf("storage: unknown driver %q (forgotten import?)", cfg)
return nil, fmt.Errorf("storage: unknown PeerStoreDriver %q (forgotten import?)", cfg)
}
return driver.New(cfg)

View file

@ -42,7 +42,7 @@ func RegisterStringStoreDriver(name string, driver StringStoreDriver) {
func OpenStringStore(cfg *DriverConfig) (StringStore, error) {
driver, ok := stringStoreDrivers[cfg.Name]
if !ok {
return nil, fmt.Errorf("store: unknown driver %q (forgotten import?)", cfg)
return nil, fmt.Errorf("store: unknown StringStoreDriver %q (forgotten import?)", cfg)
}
return driver.New(cfg)