From f14ed3a85e8709df30581a92ad5e8739af9caec6 Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Thu, 11 Sep 2014 14:30:15 +0400 Subject: [PATCH] Remove logging --- logging.go | 29 ----------------------------- main.go | 8 +++++++- server.go | 2 +- 3 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 logging.go diff --git a/logging.go b/logging.go deleted file mode 100644 index 1f1d48f..0000000 --- a/logging.go +++ /dev/null @@ -1,29 +0,0 @@ -package main - -import ( - loglib "log" - "os" - "runtime" -) - -var ( - logger *loglib.Logger -) - -func setupLogging() { - logger = loglib.New(os.Stdout, "", loglib.Ldate|loglib.Lmicroseconds) - - log("Burlesque v%s started", version) - log("GOMAXPROCS is set to %d", runtime.GOMAXPROCS(-1)) - log("Storage path: %s", config.storage) - log("Server is running at http://127.0.0.1:%d", config.port) -} - -func log(format string, args ...interface{}) { - logger.Printf("[INFO] "+format, args...) -} - -func alert(err error, format string, args ...interface{}) { - logger.Printf("[ERROR] "+format, args...) - logger.Printf(" %s", err.Error()) -} diff --git a/main.go b/main.go index 37d6ef2..8adb7f1 100644 --- a/main.go +++ b/main.go @@ -2,8 +2,10 @@ package main import ( "flag" + "fmt" "os" "os/signal" + "runtime" "syscall" "github.com/KosyanMedia/burlesque/hub" @@ -43,6 +45,10 @@ func main() { os.Exit(0) }() - setupLogging() + fmt.Println("Burlesque v%s started", version) + fmt.Println("GOMAXPROCS is set to %d", runtime.GOMAXPROCS(-1)) + fmt.Println("Storage path: %s", config.storage) + fmt.Println("Server is running at http://127.0.0.1:%d", config.port) + startServer() } diff --git a/server.go b/server.go index 055914e..77108ad 100644 --- a/server.go +++ b/server.go @@ -16,7 +16,7 @@ func startServer() { http.HandleFunc("/subscribe", subHandler) if err := http.ListenAndServe(fmt.Sprintf(":%d", config.port), nil); err != nil { - alert(err, "Error starting server on port %d", config.port) + panic(err) } }