From 5725153ec088c6b3df8d5565196042c487664b19 Mon Sep 17 00:00:00 2001 From: Farshid Tavakolizadeh Date: Sat, 29 Feb 2020 11:32:59 +0100 Subject: [PATCH] switched to global logger --- catalog/controller.go | 5 +++-- catalog/errors.go | 3 ++- catalog/http.go | 4 ++-- catalog/init.go | 20 -------------------- catalog/ldbstorage.go | 5 +++-- init.go | 24 ++++++++++++++++++------ main.go | 18 +++++++++--------- 7 files changed, 37 insertions(+), 42 deletions(-) delete mode 100644 catalog/init.go diff --git a/catalog/controller.go b/catalog/controller.go index 0a6c39e4..b20a337e 100644 --- a/catalog/controller.go +++ b/catalog/controller.go @@ -4,6 +4,7 @@ package catalog import ( "fmt" + "log" "strings" "time" @@ -137,10 +138,10 @@ func (c *Controller) cleanExpired() { } for i := range expiredServices { - logger.Printf("cleanExpired() Removing expired registration: %s", expiredServices[i].ID) + log.Printf("cleanExpired() Removing expired registration: %s", expiredServices[i].ID) err := c.storage.delete(expiredServices[i].ID) if err != nil { - logger.Printf("cleanExpired() Error removing expired registration: %s: %s", expiredServices[i].ID, err) + log.Printf("cleanExpired() Error removing expired registration: %s: %s", expiredServices[i].ID, err) continue } } diff --git a/catalog/errors.go b/catalog/errors.go index 34916ff4..8f52154a 100644 --- a/catalog/errors.go +++ b/catalog/errors.go @@ -4,6 +4,7 @@ package catalog import ( "encoding/json" + "log" "net/http" "strings" ) @@ -39,7 +40,7 @@ func ErrorResponse(w http.ResponseWriter, code int, msgs ...string) { msg, } if code >= 500 { - logger.Println("ERROR:", msg) + log.Println("ERROR:", msg) } b, _ := json.Marshal(e) w.Header().Set("Content-Type", "application/json;version="+ApiVersion) diff --git a/catalog/http.go b/catalog/http.go index 2e683e0e..f5a53c73 100644 --- a/catalog/http.go +++ b/catalog/http.go @@ -66,12 +66,12 @@ func HTTPDoAuth(req *http.Request, ticket *obtainer.Client) (*http.Response, err if res.StatusCode == http.StatusUnauthorized { // Get a new ticket and retry again - logger.Println("HTTPDoAuth() Invalid authentication ticket.") + log.Println("HTTPDoAuth() Invalid authentication ticket.") bearer, err = ticket.Renew() if err != nil { return nil, err } - logger.Println("HTTPDoAuth() Ticket was renewed.") + log.Println("HTTPDoAuth() Ticket was renewed.") // Reset the header and try again req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", bearer)) diff --git a/catalog/init.go b/catalog/init.go deleted file mode 100644 index 9f8def07..00000000 --- a/catalog/init.go +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2014-2016 Fraunhofer Institute for Applied Information Technology FIT - -package catalog - -import ( - "log" - "os" - "strconv" -) - -var logger *log.Logger - -func init() { - logger = log.New(os.Stdout, loggerPrefix, 0) - - v, err := strconv.Atoi(os.Getenv("DEBUG")) - if err == nil && v == 1 { - logger.SetFlags(log.Ltime | log.Lshortfile) - } -} diff --git a/catalog/ldbstorage.go b/catalog/ldbstorage.go index 83c96720..a8a18c20 100644 --- a/catalog/ldbstorage.go +++ b/catalog/ldbstorage.go @@ -5,6 +5,7 @@ package catalog import ( "encoding/json" "fmt" + "log" "net/url" "sync" @@ -182,7 +183,7 @@ func (s *LevelDBStorage) iterator() <-chan *ThingDescription { var td ThingDescription err := json.Unmarshal(iter.Value(), &td) if err != nil { - logger.Printf("LevelDB Error: %s", err) + log.Printf("LevelDB Error: %s", err) return } serviceIter <- &td @@ -190,7 +191,7 @@ func (s *LevelDBStorage) iterator() <-chan *ThingDescription { err := iter.Error() if err != nil { - logger.Printf("LevelDB Error: %s", err) + log.Printf("LevelDB Error: %s", err) } }() diff --git a/init.go b/init.go index b95e2245..38af2841 100644 --- a/init.go +++ b/init.go @@ -5,16 +5,28 @@ package main import ( "log" "os" - "strconv" ) -var logger *log.Logger +const ( + EnvVerbose = "VERBOSE" // print extra information e.g. line number) + EnvDisableLogTime = "DISABLE_LOG_TIME" // disable timestamp in logs +) func init() { - logger = log.New(os.Stdout, "[main] ", 0) + log.SetOutput(os.Stdout) + log.SetFlags(0) - v, err := strconv.Atoi(os.Getenv("DEBUG")) - if err == nil && v == 1 { - logger.SetFlags(log.Ltime | log.Lshortfile) + logFlags := log.LstdFlags + if evalEnv(EnvDisableLogTime) { + logFlags = 0 + } + if evalEnv(EnvVerbose) { + logFlags = logFlags | log.Lshortfile } + log.SetFlags(logFlags) +} + +// evalEnv returns the boolean value of the env variable with the given key +func evalEnv(key string) bool { + return os.Getenv(key) == "1" || os.Getenv(key) == "true" || os.Getenv(key) == "TRUE" } diff --git a/main.go b/main.go index a17561ca..7ebd915a 100644 --- a/main.go +++ b/main.go @@ -32,7 +32,7 @@ func main() { config, err := loadConfig(*confPath) if err != nil { - logger.Fatalf("Error reading config file %v: %v", *confPath, err) + log.Fatalf("Error reading config file %v: %v", *confPath, err) } if config.ServiceID == "" { config.ServiceID = uuid.NewV4().String() @@ -41,7 +41,7 @@ func main() { router, shutdownAPI, err := setupRouter(config) if err != nil { - logger.Fatal(err.Error()) + log.Fatal(err.Error()) } // Announce service using DNS-SD @@ -54,9 +54,9 @@ func main() { []string{"uri=/"}, nil) if err != nil { - logger.Printf("Failed to register DNS-SD service: %s", err.Error()) + log.Printf("Failed to register DNS-SD service: %s", err.Error()) } else { - logger.Println("Registered service via DNS-SD using type", catalog.DNSSDServiceType) + log.Println("Registered service via DNS-SD using type", catalog.DNSSDServiceType) } } @@ -72,7 +72,7 @@ func main() { err = mime.AddExtensionType(".jsonld", "application/ld+json") if err != nil { - logger.Println("ERROR: ", err.Error()) + log.Println("ERROR: ", err.Error()) } // Configure the middleware @@ -85,14 +85,14 @@ func main() { // Start listener endpoint := fmt.Sprintf("%s:%s", config.BindAddr, strconv.Itoa(config.BindPort)) - logger.Printf("Starting standalone Resource Catalog at %v", endpoint) + log.Printf("Starting standalone Resource Catalog at %v", endpoint) go n.Run(endpoint) // Ctrl+C / Kill handling handler := make(chan os.Signal, 1) signal.Notify(handler, os.Interrupt, os.Kill) <-handler - logger.Println("Shutting down...") + log.Println("Shutting down...") // Stop bonjour registration if bonjourS != nil { @@ -103,10 +103,10 @@ func main() { // Shutdown catalog API err = shutdownAPI() if err != nil { - logger.Println(err) + log.Println(err) } - logger.Println("Stopped") + log.Println("Stopped") } func setupRouter(config *Config) (*router, func() error, error) {