mtcontrib/mtsatellite
1
0
Fork 0
mirror of https://bitbucket.org/s_l_teichmann/mtsatellite synced 2025-07-02 16:10:49 +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

6
cmd/mtredisalize/changetracker.go
View File

@ -31,7 +31,7 @@ func (ct *ChangeTracker) BlockChanged(key []byte) {
var err error
var coord common.Coord
if coord, err = common.DecodeStringBytesToCoord(key); err != nil {
log.Printf("decoding key failed: %s", err)
log.Printf("decoding key failed: %s\n", err)
return
}
ct.mutex.Lock()
@ -63,12 +63,12 @@ func (ct *ChangeTracker) FlushChanges(url string) {
var buf bytes.Buffer
encoder := json.NewEncoder(&buf)
if err = encoder.Encode(changes); err != nil {
log.Printf("WARN: encode changes to JSON failed: %s", err)
log.Printf("WARN: encode changes to JSON failed: %s\n", err)
return
}
if _, err = http.Post(
url, "application/json", bytes.NewBuffer(buf.Bytes())); err != nil {
log.Printf("WARN: posting changes to %s failed: %s", url, err)
log.Printf("WARN: posting changes to %s failed: %s\n", url, err)
}
}()
return

14
cmd/mtredisalize/leveldb.go
View File

@ -285,7 +285,7 @@ func (ldbs *LevelDBSession) plainSpatialQuery(first, second []byte, done chan st
pos int64
)
if pos, err = common.DecodeStringFromBytes(key); err != nil {
log.Printf("decoding key failed: %s", err)
log.Printf("decoding key failed: %s\n", err)
return
}
if pos > to {
@ -298,7 +298,7 @@ func (ldbs *LevelDBSession) plainSpatialQuery(first, second []byte, done chan st
}
}
if err = it.GetError(); err != nil {
log.Printf("iterating failed: %s", err)
log.Printf("iterating failed: %s\n", err)
return
}
}
@ -345,7 +345,7 @@ func (ldbs *LevelDBSession) interleavedSpatialQuery(first, second []byte, done c
encodedKey []byte
)
//log.Printf("seeking to: %d", zmin)
//log.Printf("seeking to: %d\n", zmin)
it.Seek(common.ToBigEndian(zmin))
for it.Valid() {
zcode := common.FromBigEndian(it.Key())
@ -356,7 +356,7 @@ func (ldbs *LevelDBSession) interleavedSpatialQuery(first, second []byte, done c
if c := common.InterleavedToCoord(zcode); cub.Contains(c) {
if encodedKey, err = common.EncodeStringToBytes(common.CoordToPlain(c)); err != nil {
log.Printf("error encoding key: %s", err)
log.Printf("error encoding key: %s\n", err)
return
}
select {
@ -367,14 +367,14 @@ func (ldbs *LevelDBSession) interleavedSpatialQuery(first, second []byte, done c
it.Next()
} else {
next := common.BigMin(zmin, zmax, zcode)
//log.Printf("seeking to: %d", next)
//log.Printf("seeking to: %d\n", next)
it.Seek(common.ToBigEndian(next))
//log.Printf("seeking done: %d", next)
//log.Printf("seeking done: %d\n", next)
}
}
//log.Println("iterating done")
if err = it.GetError(); err != nil {
log.Printf("error while iterating: %s", err)
log.Printf("error while iterating: %s\n", err)
return
}
}()

8
cmd/mtredisalize/main.go
View File

@ -122,7 +122,7 @@ func main() {
log.Fatal(err)
}
defer listener.Close()
log.Printf("Server started at %s", listener.Addr())
log.Printf("Server started at %s\n", listener.Addr())
connChan := make(chan net.Conn)
defer close(connChan)
@ -135,12 +135,12 @@ func main() {
if err != nil {
log.Fatal(err)
}
log.Printf("Client accepted from: %s", conn.RemoteAddr())
log.Printf("Client accepted from: %s\n", conn.RemoteAddr())
connChan <- conn
}
}()
log.Printf("Doing garbage collection every: %s", gcDur)
log.Printf("Doing garbage collection every: %s\n", gcDur)
gcChan := time.Tick(gcDur)
for {
@ -148,7 +148,7 @@ func main() {
case conn := <-connChan:
var session Session
if session, err = backend.NewSession(); err != nil {
log.Printf("Cannot create session: %s", err)
log.Printf("Cannot create session: %s\n", err)
conn.Close()
} else {
go NewConnection(conn, session, maxBulkStringSize).Run()

4
cmd/mtredisalize/parser.go
View File

@ -173,7 +173,7 @@ func asString(i interface{}) string {
func (rce *RedisCommandExecutor) execute() bool {
l := len(rce.args)
if l < 1 {
log.Printf("WARN: Too less argument for command.")
log.Println("WARN: Too less argument for command.")
return false
}
cmd := strings.ToUpper(asString(rce.args[0]))
@ -259,7 +259,7 @@ func (rce *RedisCommandExecutor) ConsumeInteger(i int64) bool {
}
func (rce *RedisCommandExecutor) ConsumeError(err error) bool {
log.Printf("error: %s", err)
log.Printf("error: %s\n", err)
return true
}

18
cmd/mtredisalize/sqlite.go
View File

@ -272,7 +272,7 @@ func (ss *SqliteSession) AllKeys(hash []byte, done chan struct{}) (keys chan []b
for rows.Next() {
var key int64
if err := rows.Scan(&key); err != nil {
log.Printf("WARN: %s", err)
log.Printf("WARN: %s\n", err)
break
}
var encoded []byte
@ -334,14 +334,14 @@ func (ss *SqliteSession) interleavedSpatialQuery(first, second []byte, done chan
rows *sql.Rows
)
if rows, err = rangeStmt.Query(zmin, zmax); err != nil {
log.Printf("Error in range query: %s", err)
log.Printf("Error in range query: %s\n", err)
return
}
for rows.Next() {
var zcode int64
var data []byte
if err = rows.Scan(&zcode, &data); err != nil {
log.Printf("Error in scanning row: %s", err)
log.Printf("Error in scanning row: %s\n", err)
rows.Close()
return
}
@ -349,7 +349,7 @@ func (ss *SqliteSession) interleavedSpatialQuery(first, second []byte, done chan
if cub.Contains(c) {
var encodedKey []byte
if encodedKey, err = common.EncodeStringToBytes(common.CoordToPlain(c)); err != nil {
log.Printf("Key encoding failed: %s", err)
log.Printf("Key encoding failed: %s\n", err)
rows.Close()
return
}
@ -366,7 +366,7 @@ func (ss *SqliteSession) interleavedSpatialQuery(first, second []byte, done chan
}
}
if err = rows.Err(); err != nil {
log.Printf("Error in range query: %s", err)
log.Printf("Error in range query: %s\n", err)
}
rows.Close()
}
@ -413,19 +413,19 @@ func (ss *SqliteSession) plainSpatialQuery(first, second []byte, done chan struc
// Ordering should not be necessary.
from, to := order(common.CoordToPlain(a), common.CoordToPlain(b))
if rows, err = rangeStmt.Query(from, to); err != nil {
log.Printf("Error in range query: %s", err)
log.Printf("Error in range query: %s\n", err)
return
}
for rows.Next() {
var key int64
var data []byte
if err = rows.Scan(&key, &data); err != nil {
log.Printf("Error in scanning row: %s", err)
log.Printf("Error in scanning row: %s\n", err)
break
}
var encodedKey []byte
if encodedKey, err = common.EncodeStringToBytes(key); err != nil {
log.Printf("Key encoding failed: %s", err)
log.Printf("Key encoding failed: %s\n", err)
break
}
select {
@ -436,7 +436,7 @@ func (ss *SqliteSession) plainSpatialQuery(first, second []byte, done chan struc
}
}
if err = rows.Err(); err != nil {
log.Printf("Error in range query: %s", err)
log.Printf("Error in range query: %s\n", err)
}
rows.Close()
}