From 2ee11b5945ab6ce883e96294a91ad18c5dc01e73 Mon Sep 17 00:00:00 2001
From: Vladislav Ostapov <Vlados.ost.31@yandex.ru>
Date: Fri, 4 Apr 2025 11:55:24 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D1=81?=
 =?UTF-8?q?=D0=B1=D0=BE=D1=80=D0=BA=D1=83=20=D1=81=20=D0=BF=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B4=D1=83=D0=BF=D1=80=D0=B5=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=D0=BC,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D1=81=D0=B8=D1=8F=20=D1=80=D0=B5=D0=B2=D0=B8=D0=B7=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D0=B8=D0=B7=20=D0=B3=D0=B8=D1=82=D0=B0=20=D0=BD=D0=B5=20?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B0.?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D1=82,=20=D0=94=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=8F!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CMakeLists.txt            |  3 +++
 src/main.cpp              |  6 +++++-
 src/server/connection.cpp |  8 ++------
 src/version.h             | 12 ++++++++++++
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 src/version.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1aa16c2..e85af78 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,6 +51,8 @@ add_definitions(-DHTTP_MAX_PAYLOAD=200000000)
 
 add_subdirectory(dependencies/control_system_client)
 
+include_directories(src/)
+
 add_executable(terminal-web-server
         src/server/mime_types.hpp
         src/server/mime_types.cpp
@@ -74,6 +76,7 @@ add_executable(terminal-web-server
         src/auth/jwt.h
         src/auth/utils.cpp
         src/auth/utils.h
+        src/version.h
 )
 
 add_definitions(-DBOOST_LOG_DYN_LINK)
diff --git a/src/main.cpp b/src/main.cpp
index 73c2f30..b912332 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -17,6 +17,7 @@
 #include <fstream>
 
 #include "terminal_api_driver.h"
+#include "version.h"
 #include "auth/resources.h"
 #include "auth/jwt.h"
 #include "auth/utils.h"
@@ -590,9 +591,12 @@ int main(int argc, char *argv[]) {
 #ifdef USE_DEBUG
         BOOST_LOG_TRIVIAL(info) << "Starting DEBUG " << argv[0];
 #else
-        BOOST_LOG_TRIVIAL(info) << "Starting RELEASE build" << argv[0];
+        BOOST_LOG_TRIVIAL(info) << "Starting RELEASE " << argv[0];
 #endif
 
+        BOOST_LOG_TRIVIAL(info) << ("Build time: " PROJECT_BUILD_TIME);
+        BOOST_LOG_TRIVIAL(info) << ("Git version: " PROJECT_GIT_REVISION);
+
 #ifdef USE_DEBUG
         http::auth::jwt::secretKey = "^}u'ZKyQ%;+:lnh^GS7!=G~nRK?7[{``";
         BOOST_LOG_TRIVIAL(info) << "DEBUG build use pre-created key " << http::auth::jwt::secretKey;
diff --git a/src/server/connection.cpp b/src/server/connection.cpp
index eebd6b5..22cbda5 100644
--- a/src/server/connection.cpp
+++ b/src/server/connection.cpp
@@ -3,14 +3,10 @@
 #include <boost/log/trivial.hpp>
 #include <boost/beast.hpp>
 #include "server.hpp"
-
+#include "version.h"
 
 namespace http::server {
-    const char* SERVER_HEADER_VALUE = "TerminalWebServer"
-#ifdef PROJECT_GIT_REVISION
-    " " PROJECT_GIT_REVISION
-#endif
-    ;
+    const char* SERVER_HEADER_VALUE = "TerminalWebServer " PROJECT_GIT_REVISION;
 
     Connection::Connection(boost::asio::ip::tcp::socket socket, ConnectionManager &manager, request_handler handler)
         : socket_(std::move(socket)), connection_manager_(manager), request_handler_(std::move(handler)), request_(false), reply_() {
diff --git a/src/version.h b/src/version.h
new file mode 100644
index 0000000..6ff478e
--- /dev/null
+++ b/src/version.h
@@ -0,0 +1,12 @@
+#ifndef VERSION_H
+#define VERSION_H
+
+
+#ifndef PROJECT_GIT_REVISION
+  #warning "PROJECT_GIT_REVISION should be defined!"
+  #define PROJECT_GIT_REVISION "no-git"
+#endif
+
+#define PROJECT_BUILD_TIME __TIMESTAMP__
+
+#endif //VERSION_H