pkg/geoloc/database.go

@@ -8,7 +8,7 @@ import (
 
 var database *memdb.MemDB
 
-func CreateDatabase(ipinfos []IPInfo) error {
+func CreateDatabase(ipinfos []IPInfo) (err error) {
 	schema := &memdb.DBSchema{
 		Tables: map[string]*memdb.TableSchema{
 			"ipinfo": {
@@ -24,38 +24,28 @@ func CreateDatabase(ipinfos []IPInfo) error {
 		},
 	}
 
-	db, err := memdb.NewMemDB(schema)
+	database, err = memdb.NewMemDB(schema)
 	if err != nil {
-		return err
+		return
 	}
 
-	txn := db.Txn(true)
+	txn := database.Txn(true)
 	defer txn.Abort()
 
 	for _, ipinfo := range ipinfos {
-		if err := txn.Insert("ipinfo", ipinfo); err != nil {
+		if err = txn.Insert("ipinfo", ipinfo); err != nil {
-			return err
+			return
 		}
 	}
 
 	txn.Commit()
-
+	return
-	database = db
-	return nil
 }
 
 func SearchIPNet(ipnetnum uint) (*IPInfo, error) {
 	txn := database.Txn(false)
 	defer txn.Abort()
 
-	raw, err := txn.First("ipinfo", "id", ipnetnum)
-	if err != nil {
-		return nil, err
-	}
-	if raw == nil {
-		return nil, nil
-	}
-
 	var ipinfo IPInfo
 	for {
 		raw, err := txn.First("ipinfo", "id", ipnetnum)