Minor neatening

Author: paul-norman

mmdb.go

@@ -169,18 +169,14 @@ func mmdbSaveRestart(table string, ipVersion int) {
 		if err != nil {
 			panic(err)
 		}
+		defer fileHandle.Close()
 
 		fmt.Println("Writing MMDB file: " + filePath)
 		_, err = mmDbWriter.WriteTo(fileHandle)
 		if err != nil {
 			panic(err)
 		}
 
-		err = fileHandle.Close()
-		if err != nil {
-			panic(err)
-		}
-
 		mmDbWriter = nil
 		mmdbOpenFile(key)
 	}

postgres.go

@@ -76,7 +76,8 @@ func postgresIp(ip net.IP) *Ip {
 						
 			FROM		"%s"."ip_city"
 			 
-			WHERE		"ip_range_start" <= $1 
+			WHERE		"ip_range_start"	<= $1 
+			AND			"ip_range_end"		>= $1
 
 			ORDER BY	"ip_range_start" DESC
 			 
@@ -105,7 +106,8 @@ func postgresIp(ip net.IP) *Ip {
 							
 				FROM		"%s"."ip_country"
 				 
-				WHERE		"ip_range_start" <= $1 
+				WHERE		"ip_range_start"	<= $1
+				AND			"ip_range_end"		>= $1
 				
 				ORDER BY	"ip_range_start" DESC
 					 
@@ -133,7 +135,8 @@ func postgresIp(ip net.IP) *Ip {
 						
 			FROM		"%s"."ip_asn"
 			 
-			WHERE		"ip_range_start" <= $1 
+			WHERE		"ip_range_start"	<= $1
+			AND			"ip_range_end"		>= $1
 			
 			ORDER BY	"ip_range_start" DESC