LBRYCommunity/tracker
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

config: fixed parsing of configs

Browse source
This commit is contained in:
Leo Balduf 2016-03-02 22:15:48 +01:00 • committed by Jimmy Zelinskie
parent 919f97e4bf
commit 34428cf465
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server/http/config.go
View file

@ -7,6 +7,7 @@ package http
import (
"time"
"github.com/chihaya/chihaya/config"
"gopkg.in/yaml.v2"
)
@ -20,8 +21,8 @@ type httpConfig struct {
RealIPHeader string `yaml:"real_ip_header"`
}
func newHTTPConfig(srvcfg interface{}) (*httpConfig, error) {
bytes, err := yaml.Marshal(srvcfg)
func newHTTPConfig(srvcfg *config.ServerConfig) (*httpConfig, error) {
bytes, err := yaml.Marshal(srvcfg.Config)
if err != nil {
return nil, err
}

4
server/store/store.go
View file

@ -70,8 +70,8 @@ type Config struct {
IPStoreConfig interface{} `yaml:"ip_store_config"`
}
func newConfig(srvcfg interface{}) (*Config, error) {
bytes, err := yaml.Marshal(srvcfg)
func newConfig(srvcfg *config.ServerConfig) (*Config, error) {
bytes, err := yaml.Marshal(srvcfg.Config)
if err != nil {
return nil, err
}