From 97854f4277b74821c79baeb72b70b51e54a3bf7e Mon Sep 17 00:00:00 2001
From: Oliver Tonnhofer <olt@bogosoft.com>
Date: Thu, 7 Nov 2013 15:48:55 +0100
Subject: [PATCH] use logging.Warn instead of log.Println/fmt.Prinln

---
 writer/nodes.go     |  7 +++----
 writer/relations.go | 14 ++++++--------
 writer/ways.go      |  9 ++++-----
 writer/writer.go    |  3 +++
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/writer/nodes.go b/writer/nodes.go
index 6b8db41..78d1e36 100644
--- a/writer/nodes.go
+++ b/writer/nodes.go
@@ -8,7 +8,6 @@ import (
 	"imposm3/geom/geos"
 	"imposm3/proj"
 	"imposm3/stats"
-	"log"
 	"sync"
 )
 
@@ -53,20 +52,20 @@ func (nw *NodeWriter) loop() {
 						continue
 					}
 				}
-				log.Println(err)
+				log.Warn(err)
 				continue
 			}
 
 			n.Geom, err = geom.AsGeomElement(geos, point)
 			if err != nil {
-				log.Println(err)
+				log.Warn(err)
 				continue
 			}
 
 			if nw.limiter != nil {
 				parts, err := nw.limiter.Clip(n.Geom.Geom)
 				if err != nil {
-					log.Println(err)
+					log.Warn(err)
 					continue
 				}
 				if len(parts) >= 1 {
diff --git a/writer/relations.go b/writer/relations.go
index f6cbbb9..4e3b215 100644
--- a/writer/relations.go
+++ b/writer/relations.go
@@ -1,7 +1,6 @@
 package writer
 
 import (
-	"fmt"
 	"imposm3/cache"
 	"imposm3/database"
 	"imposm3/element"
@@ -9,7 +8,6 @@ import (
 	"imposm3/geom/geos"
 	"imposm3/proj"
 	"imposm3/stats"
-	"log"
 	"sync"
 )
 
@@ -47,7 +45,7 @@ NextRel:
 		err := rw.osmCache.Ways.FillMembers(r.Members)
 		if err != nil {
 			if err != cache.NotFound {
-				fmt.Println(err)
+				log.Warn(err)
 			}
 			continue NextRel
 		}
@@ -58,7 +56,7 @@ NextRel:
 			err := rw.osmCache.Coords.FillWay(m.Way)
 			if err != nil {
 				if err != cache.NotFound {
-					fmt.Println(err)
+					log.Warn(err)
 				}
 				continue NextRel
 			}
@@ -78,7 +76,7 @@ NextRel:
 					continue NextRel
 				}
 			}
-			log.Println(err)
+			log.Warn(err)
 			continue NextRel
 		}
 
@@ -100,14 +98,14 @@ NextRel:
 
 				}
 			}
-			log.Println(err)
+			log.Warn(err)
 			continue NextRel
 		}
 
 		if rw.limiter != nil {
 			parts, err := rw.limiter.Clip(r.Geom.Geom)
 			if err != nil {
-				log.Println(err)
+				log.Warn(err)
 				continue NextRel
 			}
 			for _, g := range parts {
@@ -120,7 +118,7 @@ NextRel:
 		}
 		err = rw.osmCache.InsertedWays.PutMembers(r.Members)
 		if err != nil {
-			fmt.Println(err)
+			log.Warn(err)
 		}
 		if rw.diffCache != nil {
 			rw.diffCache.Ways.AddFromMembers(r.Id, allMembers)
diff --git a/writer/ways.go b/writer/ways.go
index f0971a7..8516fc2 100644
--- a/writer/ways.go
+++ b/writer/ways.go
@@ -8,7 +8,6 @@ import (
 	"imposm3/geom/geos"
 	"imposm3/proj"
 	"imposm3/stats"
-	"log"
 	"sync"
 )
 
@@ -46,7 +45,7 @@ func (ww *WayWriter) loop() {
 		}
 		inserted, err := ww.osmCache.InsertedWays.IsInserted(w.Id)
 		if err != nil {
-			log.Println(err)
+			log.Warn(err)
 			continue
 		}
 		if inserted {
@@ -98,20 +97,20 @@ func (ww *WayWriter) buildAndInsert(g *geos.Geos, w *element.Way, matches interf
 				return
 			}
 		}
-		log.Println(err)
+		log.Warn(err)
 		return
 	}
 
 	way.Geom, err = geom.AsGeomElement(g, geosgeom)
 	if err != nil {
-		log.Println(err)
+		log.Warn(err)
 		return
 	}
 
 	if ww.limiter != nil {
 		parts, err := ww.limiter.Clip(way.Geom.Geom)
 		if err != nil {
-			log.Println(err)
+			log.Warn(err)
 			return
 		}
 		for _, p := range parts {
diff --git a/writer/writer.go b/writer/writer.go
index 20ecc58..7fd19be 100644
--- a/writer/writer.go
+++ b/writer/writer.go
@@ -5,11 +5,14 @@ import (
 	"imposm3/database"
 	"imposm3/expire"
 	"imposm3/geom/limit"
+	"imposm3/logging"
 	"imposm3/stats"
 	"runtime"
 	"sync"
 )
 
+var log = logging.NewLogger("writer")
+
 type ErrorLevel interface {
 	Level() int
 }