#197 Fix Logging issues

Admiral-Piett · Oct 5, 2019 · 5668414 · 5668414
1 parent 709c065
commit 5668414
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/app/cmd/goaws.go b/app/cmd/goaws.go
@@ -6,6 +6,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/p4tin/goaws/app"
+
 	log "github.com/sirupsen/logrus"
 
 	"github.com/p4tin/goaws/app/conf"
@@ -22,10 +24,11 @@ func main() {
 
 	log.SetFormatter(&log.JSONFormatter{})
 	log.SetOutput(os.Stdout)
+
 	if debug {
 		log.SetLevel(log.DebugLevel)
 	} else {
-		log.SetLevel(log.WarnLevel)
+		log.SetLevel(log.InfoLevel)
 	}
 
 	env := "Local"
@@ -35,6 +38,16 @@ func main() {
 
 	portNumbers := conf.LoadYamlConfig(filename, env)
 
+	if app.CurrentEnvironment.LogToFile {
+		filename := app.CurrentEnvironment.LogFile
+		file, err := os.OpenFile(filename, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+		if err == nil {
+			log.SetOutput(file)
+		} else {
+			log.Infof("Failed to log to file: %s, using default stderr", filename)
+		}
+	}
+
 	r := router.New()
 
 	quit := make(chan struct{}, 0)

diff --git a/app/common.go b/app/common.go
@@ -32,7 +32,7 @@ type Environment struct {
 	SnsPort                string
 	Region                 string
 	AccountID              string
-	LogMessages            bool
+	LogToFile              bool
 	LogFile                string
 	Topics                 []EnvTopic
 	Queues                 []EnvQueue

diff --git a/app/conf/config.go b/app/conf/config.go
@@ -52,7 +52,7 @@ func LoadYamlConfig(filename string, env string) []string {
 	common.LogMessages = false
 	common.LogFile = "./goaws_messages.log"
 
-	if envs[env].LogMessages == true {
+	if envs[env].LogToFile == true {
 		common.LogMessages = true
 		if envs[env].LogFile != "" {
 			common.LogFile = envs[env].LogFile

diff --git a/app/conf/goaws.yaml b/app/conf/goaws.yaml
@@ -8,8 +8,8 @@ Local:                              # Environment name that can be passed on the
   # SnsPort: 9292                     # alternate Sns Port
   Region: us-east-1
   AccountId: "100010001000"
-  LogMessages: true                 # Log messages (true/false)
-  LogFile: ./goaws_messages.log  # Log filename (for message logging
+  LogToFile: false                 # Log messages (true/false)
+  LogFile: .st/goaws_messages.log  # Log filename (for message logging
   QueueAttributeDefaults:           # default attributes for all queues
     VisibilityTimeout: 30              # message visibility timeout
     ReceiveMessageWaitTimeSeconds: 0   # receive message max wait time
@@ -40,7 +40,7 @@ Dev:                                # Another environment
   # SqsPort: 9324
   # SnsPort: 9292
   AccountId: "794373491471"
-  LogMessages: true
+  LogToFile: false
   LogFile: ./goaws_messages.log
   Queues:
     - Name: dev-queue1