Skip to content

Commit

Permalink
Handled errors during MaxMind lib installing
Browse files Browse the repository at this point in the history
  • Loading branch information
Roman Glushko committed Feb 23, 2020
1 parent 7627f55 commit d31d750
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions internal/usecase/geodata/install-maxmind-lib-usecase.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ func (u *InstallMaxmindLibUsecase) Install(configFile string, dbDirectory string
maxmindConfig, err := geoipupdate.NewConfig(configFile, dbDirectory, dbDirectory, verbose)

if err != nil {
fmt.Errorf("🚨 Error loading configuration file", err.Error())
}
fmt.Println("🚨 Error loading configuration file", err.Error())

if maxmindConfig.Verbose {
fmt.Printf("🛠 Using MaxMind Config File: %s", configFile)
fmt.Printf("🛠 Using MaxMind DB Dir: %s", maxmindConfig.DatabaseDirectory)
return
}

fmt.Println("🛠 Using MaxMind Config File: %s", configFile)
fmt.Println("🛠 Using MaxMind DB Dir: %s", maxmindConfig.DatabaseDirectory)

client := geoipupdate.NewClient(maxmindConfig)

dbReader := database.NewHTTPDatabaseReader(client, maxmindConfig)
Expand All @@ -38,18 +38,24 @@ func (u *InstallMaxmindLibUsecase) Install(configFile string, dbDirectory string
filename, err := geoipupdate.GetFilename(maxmindConfig, editionID, client)

if err != nil {
//return errors.Wrap(err, "error retrieving filename")
fmt.Println("🚨 Error retrieving filename", err.Error())

return
}

filePath := filepath.Join(maxmindConfig.DatabaseDirectory, filename)
dbWriter, err := database.NewLocalFileDatabaseWriter(filePath, maxmindConfig.LockFile, maxmindConfig.Verbose)

if err != nil {
//return errors.Wrap(err, "error creating database writer")
fmt.Println("🚨 Error creating MaxMind db writer", err.Error())

return
}

if err := dbReader.Get(dbWriter, editionID); err != nil {
//return err
fmt.Println("🚨", err.Error())

return
}
}
}

0 comments on commit d31d750

Please sign in to comment.