morpheus

commit 523a3062a3363c032844f2ad1da28b7d716c8683
parent aee1e0740e33b301c6d860d6cf2a105633b34967
Author: MTRNord <mtrnord1@gmail.com>
Date:   Mon, 21 Aug 2017 21:44:24 +0200

Make logging work better and fix Log to file

Diffstat:
M
log/Main.log
 | 
4
++++
M
main.go
 | 
6
++++--
M
uis.go
 | 
2
+-
M
util/logger.go
 | 
9
++++-----

4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/log/Main.log b/log/Main.log
@@ -0,0 +1,4 @@
+2017-08-21 21:43:23 - Starting Neo
+2017-08-21 21:43:23 - Starting Login Sequenze
+2017-08-21 21:43:23 - Avatar: 
+2017-08-21 21:43:23 - Finished Startup Neo
diff --git a/main.go b/main.go
@@ -11,8 +11,10 @@ import (
 var localLog *log.Logger
 
 func main() {
+	var file *os.File
 	localLog = util.Logger()
-	localLog = util.StartFileLog(localLog)
+	localLog, file = util.StartFileLog(localLog)
+	defer file.Close()
 	localLog.Println("Starting Neo")
 
 	widgets.NewQApplication(len(os.Args), os.Args)
@@ -31,5 +33,5 @@ func main() {
 
 	//enter the main event loop
 	widgets.QApplication_Exec()
-	localLog.Println("Finished Startup Neo")
+	localLog.Println("Stopping Neo")
 }
diff --git a/uis.go b/uis.go
@@ -47,7 +47,7 @@ func NewLoginUI(windowWidth, windowHeight int) *widgets.QWidget {
 		if avatarErr != nil {
 			localLog.Panicln(avatarErr)
 		}
-		localLog.Println(avatarURL)
+		localLog.Println("Avatar: " + avatarURL)
 	})
 
 	loginWidget.SetMinimumSize2(windowWidth, windowHeight)
diff --git a/util/logger.go b/util/logger.go
@@ -20,19 +20,18 @@ func Logger() *log.Logger {
 }
 
 //StartFileLog initialises the logging function
-func StartFileLog(localLog *log.Logger) *log.Logger {
+func StartFileLog(localLog *log.Logger) (*log.Logger, *os.File) {
 	if _, err := os.Stat("./log/"); os.IsNotExist(err) {
 		os.Mkdir("./log/", 0666)
 	}
-	f, err := os.OpenFile("./log/Main.log", os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	f, err := os.OpenFile("./log/Main.log", os.O_CREATE|os.O_APPEND|os.O_RDWR, 0666)
 	if err != nil {
 		localLog.Fatalf("error opening file: %v", err)
 	}
-	defer f.Close()
 
 	mw := io.MultiWriter(os.Stdout, f)
 
 	localLog.SetOutput(mw)
-	localLog.SetPrefix(time.Now().Format("2006-01-02 15:04:05"))
-	return localLog
+	localLog.SetPrefix(time.Now().Format("2006-01-02 15:04:05") + " - ")
+	return localLog, f
 }