Merge pull request #21 from github/simplifying-logger

using standard log for host errors

Author: Shlomi Noach

go/cmd/ccql/main.go

@@ -2,14 +2,15 @@ package main
 
 import (
 	"flag"
+	"log"
+	"os/user"
 
 	"github.com/github/ccql/go/logic"
 	"github.com/github/ccql/go/sql"
 	"github.com/github/ccql/go/text"
 
-	"github.com/outbrain/golib/log"
+	golib_log "github.com/outbrain/golib/log"
 	"gopkg.in/gcfg.v1"
-	"os/user"
 )
 
 const (
@@ -18,6 +19,9 @@ const (
 
 // main is the application's entry point. It will either spawn a CLI or HTTP itnerfaces.
 func main() {
+
+	golib_log.SetLevel(golib_log.FATAL)
+
 	osUser := ""
 	// get os username as owner
 	if usr, err := user.Current(); err == nil {
@@ -44,7 +48,7 @@ func main() {
 	}
 	queries, err := sql.ParseQueries(*queriesText, *queriesFile)
 	if err != nil {
-		log.Fatale(err)
+		log.Fatal(err.Error())
 	}
 	if len(queries) == 0 {
 		log.Fatalf("No query/queries given")
@@ -55,7 +59,7 @@ func main() {
 	}
 	hosts, err := text.ParseHosts(*hostsList, *hostsFile)
 	if err != nil {
-		log.Fatale(err)
+		log.Fatal(err.Error())
 	}
 	if len(hosts) == 0 {
 		log.Fatalf("No hosts given")

go/logic/ccql.go

@@ -2,9 +2,9 @@ package logic
 
 import (
 	"fmt"
+	"log"
 	"strings"
 
-	"github.com/outbrain/golib/log"
 	"github.com/outbrain/golib/sqlutils"
 )
 
@@ -14,13 +14,13 @@ func queryHost(host string, user string, password string, defaultSchema string,
 	mysqlURI := fmt.Sprintf("%s:%s@tcp(%s)/%s?timeout=%ds", user, password, host, defaultSchema, timeout)
 	db, _, err := sqlutils.GetDB(mysqlURI)
 	if err != nil {
-		return log.Errore(err)
+		return err
 	}
 
 	for _, query := range queries {
 		resultData, err := sqlutils.QueryResultData(db, query)
 		if err != nil {
-			return log.Errorf("%s %s", host, err.Error())
+			return err
 		}
 		for _, row := range resultData {
 			output := []string{host}
@@ -42,7 +42,9 @@ func QueryHosts(hosts []string, user string, password string, defaultSchema stri
 	for _, host := range hosts {
 		go func(host string) {
 			concurrentHosts <- true
-			queryHost(host, user, password, defaultSchema, queries, timeout)
+			if err := queryHost(host, user, password, defaultSchema, queries, timeout); err != nil {
+				log.Printf("%s %s", host, err.Error())
+			}
 			<-concurrentHosts
 
 			completedHosts <- true