From 3711ab613a1d65315521fbc4efc80adfda820a01 Mon Sep 17 00:00:00 2001
From: Michal Iskierko <michaliskierko@gmail.com>
Date: Thu, 24 Mar 2022 12:51:24 +0100
Subject: [PATCH] feature(desktop/internal): Improve log file naming convention

Logs are named app_yyyyMMdd_HHmmss.log
Version, commit and start date information are displayed in logs at the begining.
Injecting commit version from Makefile.
Moving DESKTOP_VERSION const to constants.nim

Fix #3611
---
 Makefile                                  | 3 +++
 src/app_service/service/about/service.nim | 4 +---
 src/constants.nim                         | 5 +++++
 src/nim_status_client.nim                 | 7 ++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index e1bf0b5fce..ef3d98a6ec 100644
--- a/Makefile
+++ b/Makefile
@@ -195,6 +195,9 @@ VERSIONFILE=VERSION
 DESKTOP_VERSION=`cat $(VERSIONFILE)`
 NIM_PARAMS += -d:DESKTOP_VERSION="$(DESKTOP_VERSION)"
 
+GIT_COMMIT=`git log --pretty=format:'%h' -n 1`
+NIM_PARAMS += -d:GIT_COMMIT="$(GIT_COMMIT)"
+
 $(DOTHERSIDE): | deps
 	echo -e $(BUILD_MSG) "DOtherSide"
 	+ cd vendor/DOtherSide && \
diff --git a/src/app_service/service/about/service.nim b/src/app_service/service/about/service.nim
index 31d08203a5..fa41ecee05 100644
--- a/src/app_service/service/about/service.nim
+++ b/src/app_service/service/about/service.nim
@@ -2,6 +2,7 @@ import NimQml, json, chronicles
 
 import ../../../app/core/eventemitter
 import ../../../app/core/tasks/[qt, threadpool]
+import ../../../constants
 
 import ../settings/service as settings_service
 import ../network/types
@@ -13,9 +14,6 @@ include async_tasks
 logScope:
   topics = "about-service"
 
-# This is changed during compilation by reading the VERSION file
-const DESKTOP_VERSION {.strdefine.} = "0.0.0"
-
 type
   VersionArgs* = ref object of Args
     version*: string
diff --git a/src/constants.nim b/src/constants.nim
index 05236d3cb2..897a22dce9 100644
--- a/src/constants.nim
+++ b/src/constants.nim
@@ -64,3 +64,8 @@ proc ensureDirectories*(dataDir, tmpDir, logDir: string) =
   createDir(dataDir)
   createDir(tmpDir)
   createDir(logDir)
+
+# This is changed during compilation by reading the VERSION file
+const DESKTOP_VERSION* {.strdefine.} = "0.0.0"
+# This is changed during compilation by executing git command
+const GIT_COMMIT* {.strdefine.} = ""
diff --git a/src/nim_status_client.nim b/src/nim_status_client.nim
index fb138071fd..76d445626a 100644
--- a/src/nim_status_client.nim
+++ b/src/nim_status_client.nim
@@ -49,7 +49,8 @@ proc prepareLogging() =
         except:
           logLoggingFailure(cstring(msg), getCurrentException())
 
-  let logFile = fmt"app_{getTime().toUnix}.log"
+  let formattedDate = now().format("yyyyMMdd'_'HHmmss")
+  let logFile = fmt"app_{formattedDate}.log"
   discard defaultChroniclesStream.outputs[1].open(LOGDIR & logFile, fmAppend)
 
 proc setupRemoteSignalsHandling() =
@@ -134,6 +135,10 @@ proc mainProc() =
     info "Terminating the app as the second instance"
     quit()
 
+  info fmt("Version: {DESKTOP_VERSION}")
+  info fmt("Commit: {GIT_COMMIT}")
+  info "Current date:", currentDateTime=now()
+
   info "starting application controller..."
   appController.start()