store/server: normalized error messages/formatting
This commit is contained in:
parent
1ba0f92ceb
commit
eca7d9ee72
5 changed files with 7 additions and 10 deletions
|
@ -39,10 +39,7 @@ func Register(name string, con Constructor) {
|
||||||
func New(cfg *chihaya.ServerConfig, tkr *tracker.Tracker) (Server, error) {
|
func New(cfg *chihaya.ServerConfig, tkr *tracker.Tracker) (Server, error) {
|
||||||
con, ok := constructors[cfg.Name]
|
con, ok := constructors[cfg.Name]
|
||||||
if !ok {
|
if !ok {
|
||||||
return nil, fmt.Errorf(
|
return nil, fmt.Errorf("server: unknown Constructor %q (forgotten import?)", cfg.Name)
|
||||||
"server: unknown Constructor %q (forgotten import?)",
|
|
||||||
cfg.Name,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
return con(cfg, tkr)
|
return con(cfg, tkr)
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@ func RegisterClientStoreDriver(name string, driver ClientStoreDriver) {
|
||||||
func OpenClientStore(cfg *DriverConfig) (ClientStore, error) {
|
func OpenClientStore(cfg *DriverConfig) (ClientStore, error) {
|
||||||
driver, ok := clientStoreDrivers[cfg.Name]
|
driver, ok := clientStoreDrivers[cfg.Name]
|
||||||
if !ok {
|
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)
|
return driver.New(cfg)
|
||||||
|
|
|
@ -60,10 +60,10 @@ type IPStoreDriver interface {
|
||||||
// it panics.
|
// it panics.
|
||||||
func RegisterIPStoreDriver(name string, driver IPStoreDriver) {
|
func RegisterIPStoreDriver(name string, driver IPStoreDriver) {
|
||||||
if driver == nil {
|
if driver == nil {
|
||||||
panic("store: could not register nil ClientStoreDriver")
|
panic("store: could not register nil IPStoreDriver")
|
||||||
}
|
}
|
||||||
if _, dup := ipStoreDrivers[name]; dup {
|
if _, dup := ipStoreDrivers[name]; dup {
|
||||||
panic("store: could not register duplicate ClientStoreDriver: " + name)
|
panic("store: could not register duplicate IPStoreDriver: " + name)
|
||||||
}
|
}
|
||||||
ipStoreDrivers[name] = driver
|
ipStoreDrivers[name] = driver
|
||||||
}
|
}
|
||||||
|
@ -72,7 +72,7 @@ func RegisterIPStoreDriver(name string, driver IPStoreDriver) {
|
||||||
func OpenIPStore(cfg *DriverConfig) (IPStore, error) {
|
func OpenIPStore(cfg *DriverConfig) (IPStore, error) {
|
||||||
driver, ok := ipStoreDrivers[cfg.Name]
|
driver, ok := ipStoreDrivers[cfg.Name]
|
||||||
if !ok {
|
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)
|
return driver.New(cfg)
|
||||||
|
|
|
@ -52,7 +52,7 @@ func RegisterPeerStoreDriver(name string, driver PeerStoreDriver) {
|
||||||
func OpenPeerStore(cfg *DriverConfig) (PeerStore, error) {
|
func OpenPeerStore(cfg *DriverConfig) (PeerStore, error) {
|
||||||
driver, ok := peerStoreDrivers[cfg.Name]
|
driver, ok := peerStoreDrivers[cfg.Name]
|
||||||
if !ok {
|
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)
|
return driver.New(cfg)
|
||||||
|
|
|
@ -42,7 +42,7 @@ func RegisterStringStoreDriver(name string, driver StringStoreDriver) {
|
||||||
func OpenStringStore(cfg *DriverConfig) (StringStore, error) {
|
func OpenStringStore(cfg *DriverConfig) (StringStore, error) {
|
||||||
driver, ok := stringStoreDrivers[cfg.Name]
|
driver, ok := stringStoreDrivers[cfg.Name]
|
||||||
if !ok {
|
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)
|
return driver.New(cfg)
|
||||||
|
|
Loading…
Add table
Reference in a new issue