mtcontrib/mtsatellite
1
0
Fork 0
mirror of https://bitbucket.org/s_l_teichmann/mtsatellite synced 2025-06-28 06:12:08 +02:00
Code Issues Projects Releases Wiki Activity

Terminate all log.Printf with a new line.

Browse Source
This commit is contained in:
Sascha L. Teichmann
2015-07-20 14:19:41 +02:00
parent 91a50a4622
commit ecd599e44d
11 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/mtwebmapper/subbaseline.go
View File

@ -97,7 +97,7 @@ func (sb *subBaseLine) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
rw.Header().Set("Content-Type", "image/png")
if err = png.Encode(rw, img); err != nil {
log.Printf("WARN: encoding image failed: %s", err)
log.Printf("WARN: encoding image failed: %s\n", err)
}
}
@ -147,7 +147,7 @@ func blowUp(src image.Image) *image.RGBA {
py += dy
}
//log.Printf("Rendering took: %s", time.Since(start))
//log.Printf("Rendering took: %s\n", time.Since(start))
return dst
}
@ -185,7 +185,7 @@ func blowUpRGBA(src *image.RGBA) *image.RGBA {
py += dy
}
//log.Printf("Rendering took: %s", time.Since(start))
//log.Printf("Rendering took: %s\n", time.Since(start))
return dst
}
@ -219,7 +219,7 @@ func toUint(s string) uint {
var err error
var x int
if x, err = strconv.Atoi(s); err != nil {
log.Printf("WARN: Cannot convert to int: %s", err)
log.Printf("WARN: Cannot convert to int: %s\n", err)
return 0
}
return uint(x)

18
cmd/mtwebmapper/tilesupdater.go
View File

@ -95,7 +95,7 @@ func (tu *tileUpdater) checkIP(r *http.Request) bool {
var host []string
if host = strings.SplitN(r.RemoteAddr, ":", 2); len(host) < 1 {
log.Printf("WARN: cannot extract host from '%s'\n", r.RemoteAddr)
log.Printf("WARN: cannot extract host from '%s'.\n", r.RemoteAddr)
return false
}
@ -116,7 +116,7 @@ func (tu *tileUpdater) checkIP(r *http.Request) bool {
func (tu *tileUpdater) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
if !tu.checkIP(r) {
log.Printf("WARN: Unauthorized update request from '%s'", r.RemoteAddr)
log.Printf("WARN: Unauthorized update request from '%s'\n", r.RemoteAddr)
http.Error(rw, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
return
}
@ -125,7 +125,7 @@ func (tu *tileUpdater) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
var newChanges []xz
decoder := json.NewDecoder(r.Body)
if err = decoder.Decode(&newChanges); err != nil {
log.Printf("WARN: JSON document broken: %s", err)
log.Printf("WARN: JSON document broken: %s\n", err)
http.Error(rw, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
return
}
@ -163,7 +163,7 @@ func (tu *tileUpdater) doUpdates() {
var client *common.RedisClient
var err error
if client, err = common.NewRedisClient("tcp", tu.redisAddress); err != nil {
log.Printf("WARN: Cannot connect to redis server: %s", err)
log.Printf("WARN: Cannot connect to redis server: %s\n", err)
continue
}
btc := common.NewBaseTileCreator(client, tu.colors, tu.transparent, baseDir, true)
@ -174,7 +174,7 @@ func (tu *tileUpdater) doUpdates() {
parentJobs := make(map[xz]uint16)
for c := range changes {
//log.Printf("job: %+v", c)
//log.Printf("job: %+v\n", c)
jobs <- c
pxz := c.parent()
parentJobs[pxz.P] |= pxz.Mask
@ -211,7 +211,7 @@ func updatePyramidTiles(level int, baseDir string, jobs chan xzm, done *sync.Wai
for job := range jobs {
if err := updatePyramidTile(scratch, level, baseDir, job); err != nil {
log.Printf("Updating pyramid tile failed: %s", err)
log.Printf("Updating pyramid tile failed: %s\n", err)
}
}
}
@ -248,7 +248,7 @@ func updatePyramidTile(scratch *image.RGBA, level int, baseDir string, j xzm) er
for i := uint16(0); i < 4; i++ {
if j.Mask&(1<<i) != 0 {
//log.Printf("level %d: modified %d", level, i)
//log.Printf("level %d: modified %d\n", level, i)
o := ofs[i]
bx, bz := int(2*j.P.X), int(2*j.P.Z)
path := filepath.Join(
@ -266,7 +266,7 @@ func updatePyramidTile(scratch *image.RGBA, level int, baseDir string, j xzm) er
if orig == nil {
orig = common.LoadPNG(origPath)
}
//log.Printf("level %d: copied %d", level, i)
//log.Printf("level %d: copied %d\n", level, i)
min := orig.Bounds().Min.Add(dps[i])
r := image.Rectangle{min, min.Add(windowSize)}
draw.Draw(scratch, r, orig, min, draw.Src)
@ -283,7 +283,7 @@ func updateBaseTiles(jobs chan xz, btc *common.BaseTileCreator, done *sync.WaitG
xz := job.dequantize()
//log.Printf("%d/%d %d/%d", x, z, job.X, job.Z)
if err := btc.CreateTile(xz.X-1, xz.Z-1, int(job.X), int(job.Z)); err != nil {
log.Printf("WARN: create tile failed: %s", err)
log.Printf("WARN: create tile failed: %s\n", err)
}
}
}