Use log.std and just optionally attach syslog to it.

blobs.go

@@ -6,6 +6,7 @@ import (
 	"flag"
 	"io"
 	"io/ioutil"
+	"log"
 	"net/http"
 	"os"
 	"sort"

database.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"log"
 	"net/http"
 
 	// Alias this because we call our connection couchbase

dns.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"log"
 	"net"
 	"strconv"
 	"strings"

files.go

@@ -5,6 +5,7 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"

frames.go

@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"flag"
+	"log"
 	"net"
 	"net/http"
 	"sync"
@@ -133,7 +134,6 @@ func connectNewFramesClient(addr string) *frameClient {
 	frt := &framesweb.FramesRoundTripper{
 		Dialer:  conn,
 		Timeout: time.Second * 5,
-		Logger:  log,
 	}
 	hc := &http.Client{Transport: frt}
 	frameClientsLock.Lock()

fsck.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"log"
 	"net/http"
 )
 

hash.go

@@ -10,6 +10,7 @@ import (
 	"hash"
 	"io"
 	"io/ioutil"
+	"log"
 	"os"
 	"path/filepath"
 	"strings"

heartbeat.go

@@ -3,6 +3,7 @@ package main
 import (
 	"errors"
 	"fmt"
+	"log"
 	"net"
 	"net/url"
 	"strings"

http.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"log"
 	"math/rand"
 	"net/http"
 	"os"

http_api.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"math/rand"
 	"net/http"
 	"net/url"

list.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"log"
 	"strings"
 )
 

logging.go

@@ -3,24 +3,16 @@
 package main
 
 import (
-	corelog "log"
+	"log"
 	"log/syslog"
-	"os"
 )
 
-var log *corelog.Logger
-
-func init() {
-	log = corelog.New(os.Stderr, "", 0)
-	log.SetFlags(corelog.LstdFlags)
-}
-
 func initLogger(slog bool) {
 	if slog {
 		lw, err := syslog.New(syslog.LOG_INFO, "cbfs")
 		if err != nil {
-			corelog.Fatalf("Can't initialize logger: %v", err)
+			log.Fatalf("Can't initialize syslog: %v", err)
 		}
-		log = corelog.New(lw, "", 0)
+		log.SetOutput(lw)
 	}
 }

main.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"log"
 	"math/rand"
 	"net/http"
 	"os"

nodes.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"log"
 	"math/rand"
 	"net/http"
 	"sort"

tar.go

@@ -3,6 +3,7 @@ package main
 import (
 	"archive/tar"
 	"compress/gzip"
+	"log"
 	"net/http"
 )
 

tasks.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"log"
 	"math/rand"
 	"strings"
 	"time"

zip.go

@@ -4,6 +4,7 @@ import (
 	"archive/zip"
 	"encoding/json"
 	"errors"
+	"log"
 	"net/http"
 	"strings"