Skip to content

Commit

Permalink
revert to default logger
Browse files Browse the repository at this point in the history
  • Loading branch information
aorticweb committed Jan 27, 2022
1 parent 1162f72 commit 1a84546
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@
.env

# Scratch file
.idea
.idea

# air temp
tmp/
17 changes: 8 additions & 9 deletions app/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import (
"context"
"errors"
"fmt"
"log"
"net/http"
"os"
"os/signal"
"syscall"
"time"

api "github.com/aorticweb/msg-app/app/handlers"
"github.com/sirupsen/logrus"
"gorm.io/driver/postgres"
"gorm.io/gorm"
)
Expand Down Expand Up @@ -63,13 +63,12 @@ func gracefullyShutdown(server *http.Server) error {
if err == nil {
return nil
}
logrus.Error("Server shutdown did not succeed in %v: %v", shutdownTimeout, err)
log.Printf("Server shutdown did not succeed in %v: %v\n", shutdownTimeout, err)
err = server.Close()

if err != nil {
return fmt.Errorf("Server close failed: %v", err)
}
logrus.Info("Bye Bye")
return nil
}

Expand All @@ -78,10 +77,10 @@ func waitForKillSwitch(kill chan os.Signal, server *http.Server) {
gracefullyShutdown(server)
}

func setupServer(logger *logrus.Logger) (*http.Server, error) {
func setupServer(logger *log.Logger) (*http.Server, error) {
db, err := waitForDB(dbConnectionWaitTime)
if err != nil {
logger.Error("Failed to fetch database connection")
logger.Println("Failed to fetch database connection")
return nil, err
}
killSwitch := registerKillSwitch()
Expand All @@ -96,21 +95,21 @@ func setupServer(logger *logrus.Logger) (*http.Server, error) {
return &server, nil
}

func must(err error, logger *logrus.Logger) {
func must(err error, logger *log.Logger) {
if err != nil {
logger.Fatal(err)
os.Exit(1)
}
}

func main() {
logger := logrus.New()
logger := log.New(os.Stdout, "msg-app: ", log.LstdFlags|log.Llongfile)
server, err := setupServer(logger)
must(err, logger)
logger.Info("API says Hello\n")
logger.Println("API says Hello")
err = server.ListenAndServe()
if err == http.ErrServerClosed {
logger.Info("API says Goodbye\n")
logger.Println("API says Goodbye")
os.Exit(0)
}
must(err, logger)
Expand Down
2 changes: 1 addition & 1 deletion app/handlers/health.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ func (a *API) handleHealth() http.HandlerFunc {
var c int
a.db.Raw("SELECT COUNT(table_name) FROM information_schema.tables WHERE table_schema = 'public' AND table_name = 'user';").Scan(&c)
if c != 1 {
a.logger.Error("Health check failed, could not reach database")
a.logger.Println("Health check failed, could not reach database")
w.WriteHeader(http.StatusExpectationFailed)
return
}
Expand Down
6 changes: 3 additions & 3 deletions app/handlers/routes.go
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
package api

import (
"log"
"net/http"

"github.com/gorilla/mux"
"github.com/sirupsen/logrus"
"gorm.io/gorm"
)

type API struct {
db *gorm.DB
router *mux.Router
logger *logrus.Logger
logger *log.Logger
}

func (a *API) ServeHTTP(w http.ResponseWriter, r *http.Request) {
a.router.ServeHTTP(w, r)
}

func NewAPI(db *gorm.DB, logger *logrus.Logger) *API {
func NewAPI(db *gorm.DB, logger *log.Logger) *API {
a := &API{db, mux.NewRouter(), logger}
a.routes()
return a
Expand Down

0 comments on commit 1a84546

Please sign in to comment.