xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Chore: aggregate logger

Browse source
This commit is contained in:
Dreamacro 2019-12-20 17:22:24 +08:00
parent eae06a4a7d
commit dd61e8d19d
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
config/initial.go
View file

@ -10,8 +10,7 @@ import (
"strings" "strings"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/log"
log "github.com/sirupsen/logrus"
) )
func downloadMMDB(path string) (err error) { func downloadMMDB(path string) (err error) {
@ -65,13 +64,13 @@ func Init(dir string) error {
// initial config.yaml // initial config.yaml
if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) { if _, err := os.Stat(C.Path.Config()); os.IsNotExist(err) {
log.Info("Can't find config, create an empty file") log.Infoln("Can't find config, create an empty file")
os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644) os.OpenFile(C.Path.Config(), os.O_CREATE|os.O_WRONLY, 0644)
} }
// initial mmdb // initial mmdb
if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) { if _, err := os.Stat(C.Path.MMDB()); os.IsNotExist(err) {
log.Info("Can't find MMDB, start download") log.Infoln("Can't find MMDB, start download")
err := downloadMMDB(C.Path.MMDB()) err := downloadMMDB(C.Path.MMDB())
if err != nil { if err != nil {
return fmt.Errorf("Can't download MMDB: %s", err.Error()) return fmt.Errorf("Can't download MMDB: %s", err.Error())

7
main.go
View file

@ -12,8 +12,7 @@ import (
"github.com/Dreamacro/clash/config" "github.com/Dreamacro/clash/config"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/hub" "github.com/Dreamacro/clash/hub"
"github.com/Dreamacro/clash/log"
log "github.com/sirupsen/logrus"
) )
var ( var (
@ -55,11 +54,11 @@ func main() {
} }
if err := config.Init(C.Path.HomeDir()); err != nil { if err := config.Init(C.Path.HomeDir()); err != nil {
log.Fatalf("Initial configuration directory error: %s", err.Error()) log.Fatalln("Initial configuration directory error: %s", err.Error())
} }
if err := hub.Parse(); err != nil { if err := hub.Parse(); err != nil {
log.Fatalf("Parse config error: %s", err.Error()) log.Fatalln("Parse config error: %s", err.Error())
} }
sigCh := make(chan os.Signal, 1) sigCh := make(chan os.Signal, 1)

4
rules/geoip.go
View file

@ -4,9 +4,9 @@ import (
"sync" "sync"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/log"
"github.com/oschwald/geoip2-golang" "github.com/oschwald/geoip2-golang"
log "github.com/sirupsen/logrus"
) )
var ( var (
@ -50,7 +50,7 @@ func NewGEOIP(country string, adapter string, noResolveIP bool) *GEOIP {
var err error var err error
mmdb, err = geoip2.Open(C.Path.MMDB()) mmdb, err = geoip2.Open(C.Path.MMDB())
if err != nil { if err != nil {
log.Fatalf("Can't load mmdb: %s", err.Error()) log.Fatalln("Can't load mmdb: %s", err.Error())
} }
}) })